EFM 6.x patch

diff -ruN EnhancedFlightMap/FlightMaster.lua EnhancedFlightMap-6.x/FlightMaster.lua
--- EnhancedFlightMap/FlightMaster.lua  2014-11-20 20:59:13.000000000 -0500
+++ EnhancedFlightMap-6.x/FlightMaster.lua  2014-11-20 21:00:29.000000000 -0500
@@ -22,7 +22,7 @@
    local deadNodes     = {};

    local nodeStyle     = 0;
-   if (IsSwimming() == 1) then
+   if (IsSwimming()) then
        nodeStyle   = 1;
        EFM_Shared_DebugMessage("Player is Swimming.", Lys_Debug);
    end
@@ -76,7 +76,7 @@
 -- Function: Commands to run when we get the TAXIMAP_OPEN event
 function EFM_FM_TaxiMapOpenEvent()
    local nodeStyle = 0;
-   if (IsSwimming() == 1) then
+   if (IsSwimming()) then
        nodeStyle   = 1;
    end

@@ -141,7 +141,7 @@
    local missingHop    = false;
    local nodeStyle     = 0;

-   if (IsSwimming() == 1) then
+   if (IsSwimming()) then
        nodeStyle   = 1;
    end

diff -ruN EnhancedFlightMap/MapWindow.lua EnhancedFlightMap-6.x/MapWindow.lua
--- EnhancedFlightMap/MapWindow.lua 2014-11-20 20:59:13.000000000 -0500
+++ EnhancedFlightMap-6.x/MapWindow.lua 2014-11-20 21:16:35.000000000 -0500
@@ -160,13 +160,15 @@
        continentMap    = "Interface\\TaxiFrame\\TAXIMAP870";
    elseif (newMap == 6) then
        continentMap    = "Interface\\TaxiFrame\\TAXIMAP870";
+   elseif (newMap == 7) then
+       continentMap    = "Interface\\TaxiFrame\\TAXIMAP1116";
    else
        continentMap    = "Interface\\TaxiFrame\\TAXIMAP1";
        newMap      = 1;
    end

    -- New Window Button Colours
-   for index = 1, 6 do
+   for index = 1, 7 do
        local myButton = getglobal("EFM_MapWindowNew_Con"..index.."Text");
        if (myButton) then
            if (index == newMap) then
@@ -196,7 +198,7 @@
        mapNum = GetCurrentMapContinent();
    end

-   if ((mapNum < 1) or (mapNum > 6)) then
+   if ((mapNum < 1) or (mapNum > 7)) then
        mapNum = GetCurrentMapContinent();
    end

@@ -216,7 +218,13 @@

 -- Function: Draw the "Offline" Map Window
 function EFM_MW_Setup()
-   local continentNames = { GetMapContinents() } ;
+   local continentNames = { };
+   local continentsP6 = { GetMapContinents() };
+   local index = 0;
+   for i = 2, #continentsP6, 2 do
+       index = index + 1;
+       newInstance.ContinentList[index] = continentsP6[i];
+   end

    local EFM_MapWindowNew = CreateFrame("FRAME", "EFM_MapWindowNew", UIParent);

@@ -343,7 +351,8 @@
    EFM_MapWindowNew_Con5:SetPoint("TOPLEFT", EFM_MapWindowNew_Con4, "BOTTOMLEFT", 0, -2);
    EFM_MapWindowNew_Con5:SetScript("OnClick", function() EFM_MW_ChangeMap(5); end );
    -- DO NOT REMOVE THIS CODEBLOCK! --
-]]
+]]
+
    -- Pandaria - Continent 6
    local EFM_MapWindowNew_Con6 = CreateFrame("Button", "EFM_MapWindowNew_Con6", EFM_MapWindowNew, "UIPanelButtonTemplate");
    EFM_MapWindowNew_Con6:SetWidth(138);
@@ -353,4 +362,15 @@
    EFM_MapWindowNew_Con6:ClearAllPoints();
    EFM_MapWindowNew_Con6:SetPoint("TOPLEFT", EFM_MapWindowNew_Con4, "BOTTOMLEFT", 0, -2);
    EFM_MapWindowNew_Con6:SetScript("OnClick", function() EFM_MW_ChangeMap(6); end );
+
+   -- Draenor - Continent 7
+   local EFM_MapWindowNew_Con7 = CreateFrame("Button", "EFM_MapWindowNew_Con7", EFM_MapWindowNew, "UIPanelButtonTemplate");
+   EFM_MapWindowNew_Con7:SetWidth(138);
+   EFM_MapWindowNew_Con7:SetHeight(22);
+   EFM_MapWindowNew_Con7:SetText(continentNames[7]);
+   EFM_MapWindowNew_Con7:RegisterForClicks("LeftButtonUp");
+   EFM_MapWindowNew_Con7:ClearAllPoints();
+   EFM_MapWindowNew_Con7:SetPoint("TOPLEFT", EFM_MapWindowNew_Con6, "BOTTOMLEFT", 0, -2);
+   EFM_MapWindowNew_Con7:SetScript("OnClick", function() EFM_MW_ChangeMap(7); end );
+
 end
diff -ruN EnhancedFlightMap/Timer.lua EnhancedFlightMap-6.x/Timer.lua
--- EnhancedFlightMap/Timer.lua 2014-11-20 20:59:13.000000000 -0500
+++ EnhancedFlightMap-6.x/Timer.lua 2014-11-20 21:19:35.000000000 -0500
@@ -39,7 +39,7 @@

 -- Function: Check the in flight status
 function EFM_Timer_CheckInFlightStatus()
-   if (UnitOnTaxi("player") == 1) then
+   if (UnitOnTaxi("player")) then
        if (EFM_Timer_StartRecording == true) then
            EFM_Timer_StartRecording    = false;
            EFM_Timer_Recording         = true;
diff -ruN EnhancedFlightMap/nodeinfo.lua EnhancedFlightMap-6.x/nodeinfo.lua
--- EnhancedFlightMap/nodeinfo.lua  2014-11-20 20:59:13.000000000 -0500
+++ EnhancedFlightMap-6.x/nodeinfo.lua  2014-11-20 21:19:00.000000000 -0500
@@ -268,7 +268,7 @@
    end

    for myContinent in pairs(EFM_Data[EFM_Global_Faction]) do
-       if (EFM_Data[EFM_Global_Faction][myContinent][zoneName] ~= nil) then
+       if (EFM_Data[EFM_Global_Faction][myContinent][zoneName] ~= nil and myContinent == EFM_Shared_GetContinentName(GetCurrentMapContinent())) then
            for myNode in pairs(EFM_Data[EFM_Global_Faction][myContinent][zoneName]) do
                EFM_Shared_DebugMessage("Zone Node Added: "..EFM_Data[EFM_Global_Faction][myContinent][zoneName][myNode]["name"], myDebug);
                table.insert(nodeList, EFM_Data[EFM_Global_Faction][myContinent][zoneName][myNode]["name"]);
diff -ruN EnhancedFlightMap/shared_functions.lua EnhancedFlightMap-6.x/shared_functions.lua
--- EnhancedFlightMap/shared_functions.lua  2014-11-20 20:59:13.000000000 -0500
+++ EnhancedFlightMap-6.x/shared_functions.lua  2014-11-20 21:22:20.000000000 -0500
@@ -98,14 +98,18 @@

 -- Function: Get continent name
 function EFM_Shared_GetContinentName(continentNum)
-   local continentNames, key, val = { GetMapContinents() } ;
+   local continentNames = { };
+   local continentsP6 = { GetMapContinents() };
+   local index = 0;
+   for i = 2, #continentsP6, 2 do
+       index = index + 1;
+       continentNames[index] = continentsP6[i];
+   end

    return continentNames[continentNum];
 end

 -- Function: Get zone name
 function EFM_Shared_GetZoneName(continentNum, zoneNum)
-   local zoneNames = { GetMapZones(continentNum) } ;
-
-   return zoneNames[zoneNum];
+   return GetMapNameByID(GetCurrentMapAreaID())
 end