Merge pull request #384 from artscout/master

4.4.1 support
IrcDirk · Oct 3, 2024 · e43565e · e43565e
2 parents e4227ef + 349008f
commit e43565e
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/Carbonite.Notes/Carbonite.Notes.toc b/Carbonite.Notes/Carbonite.Notes.toc
@@ -1,4 +1,4 @@
-## Interface: 40400
+## Interface: 40401
 ## Title: Carbonite Notes @project-version@
 ## Version: @project-version@
 ## Author: No one

diff --git a/Carbonite.Quests/Carbonite.Quests.toc b/Carbonite.Quests/Carbonite.Quests.toc
@@ -1,4 +1,4 @@
-## Interface: 40400
+## Interface: 40401
 ## Title: Carbonite Quest - Classic @project-version@
 ## Version: @project-version@
 ## Author: No One

diff --git a/Carbonite.Social/Carbonite.Social.toc b/Carbonite.Social/Carbonite.Social.toc
@@ -1,4 +1,4 @@
-## Interface: 40400
+## Interface: 40401
 ## Title: Carbonite Social & Punks @project-version@
 ## Version: @project-version@
 ## Author: No One

diff --git a/Carbonite.Warehouse/Carbonite.Warehouse.toc b/Carbonite.Warehouse/Carbonite.Warehouse.toc
@@ -1,4 +1,4 @@
-## Interface: 40400
+## Interface: 40401
 ## Title: Carbonite Warehouse @project-version@
 ## Version: @project-version@
 ## Author: No One

diff --git a/Carbonite/Carbonite.toc b/Carbonite/Carbonite.toc
@@ -1,4 +1,4 @@
-## Interface: 40400
+## Interface: 40401
 ## Title: Carbonite Maps - Classic @project-version@
 ## Version: @project-version@
 ## Author: No one

diff --git a/Carbonite/NxMap.lua b/Carbonite/NxMap.lua
@@ -9178,7 +9178,7 @@ function Nx.Map:InitTables()
 
 	Nx.Map.MapZones = {
 		[0] = {12,13,1945,113,948,0,-1},
-		[1] = {1411,1412,1413,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1454,1456,1457,1943,1947,1950,198,199,249,327},
+		[1] = {1411,1412,1413,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1454,1456,1457,1943,1947,1950,198,199,249,327,338},
 		[2] = {1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1453,1455,1458,1941,1942,1954,1957,124,179,201,202,204,205,203,210,217,218,224,241,244,245},
 		[3] = {1944,1946,1948,1949,1951,1952,1953,1955},
 		[4] = {114,115,116,117,118,119,120,121,123,125,127,170},

diff --git a/Carbonite/NxMapData.lua b/Carbonite/NxMapData.lua
@@ -5265,7 +5265,7 @@ Map.MiniMapBlks = {
 		Map.MoltenFrontMapBlks,
 		2725,		-- 2725 to 3531
 		27, 25,
-		Map.MapWorldInfo[338].X + Map.MapInfo[1].X + 3152.92266259766, Map.MapWorldInfo[338].Y + Map.MapInfo[1].Y + -2105.97034960937,
+		Map.MapWorldInfo[338].X + Map.MapInfo[1].X + 2452.92, Map.MapWorldInfo[338].Y + Map.MapInfo[1].Y + -1105.97,
 		"World\\Minimaps\\FirelandsDailies"
 	},
 	[407] = {

diff --git a/Carbonite/NxUI.lua b/Carbonite/NxUI.lua
@@ -24,6 +24,7 @@ local NotInitializedWins = {}
 local L = LibStub("AceLocale-3.0"):GetLocale("Carbonite")
 
 local HideFramesOnEsc = {}
+local GetMouseFoci = GetMouseFoci or GetMouseFocus
 
 function Nx:UIInit()
 
@@ -3146,7 +3147,7 @@ function Nx.Window:OnUpdate (elapsed)
 	local x = not win.FullLock and Nx.Util_IsMouseOver (this)
 
 	if x then
-		if GetMouseFocus() == this then
+		if GetMouseFoci() == this then
 
 			local x, y = GetCursorPosition()
 			x = x / this:GetEffectiveScale()