v0.10.2-alpha

Bubb13 · Mar 22, 2024 · 5b0b672 · 5b0b672
1 parent c57f978
commit 5b0b672
Show file tree

Hide file tree

Showing 21 changed files with 27 additions and 17 deletions.
diff --git a/EEex/EEex.tp2 b/EEex/EEex.tp2
@@ -1,6 +1,6 @@
 BACKUP ~EEex/backup~
 AUTHOR ~Bubb~
-VERSION ~devel~
+VERSION ~v0.10.2-alpha~
 README ~EEex/readme-EEex.html~
 
 BEGIN ~EEex~ LABEL ~B3-EEex-Main~

diff --git a/EEex/copy/EEex_Menu.lua b/EEex/copy/EEex_Menu.lua
@@ -102,15 +102,15 @@ function EEex_Menu_Find(menuName, panel, state)
 	return EngineGlobals.findMenu(menuName, panel or 0, state or 0)
 end
 
-function EEex_Menu_GetItemFunction(funcRefPtr)
-	local regIndex = funcRefPtr:getValue()
+function EEex_Menu_GetItemFunction(funcRef)
+	local regIndex = funcRef.value
 	return regIndex ~= 0 and EEex_GetLuaRegistryIndex(regIndex) or nil
 end
 
-function EEex_Menu_SetItemFunction(funcRefPtr, func)
-	local regIndex = funcRefPtr:getValue()
+function EEex_Menu_SetItemFunction(funcRef, func)
+	local regIndex = funcRef.value
 	if regIndex == 0 then
-		funcRefPtr:setValue(EEex_AddToLuaRegistry(func))
+		funcRef.value = EEex_AddToLuaRegistry(func)
 	else
 		EEex_SetLuaRegistryIndex(regIndex, func)
 	end
@@ -133,10 +133,10 @@ uiVariant.getValue = EEex_Menu_GetItemVariant
 
 function EEex_Menu_SetItemVariant(variantRefPtr, myVal)
 
-	variant = variantRefPtr:getValue()
+	variant = variantRefPtr.reference
 	if not variant then
 		variant = EEex_PtrToUD(EEex_Malloc(uiVariant.sizeof), "uiVariant")
-		variantRefPtr:setValue(variant)
+		variantRefPtr.reference = variant
 	end
 
 	local myValType = type(myVal)

diff --git a/EEex/copy/EEex_Resource.lua b/EEex/copy/EEex_Resource.lua
@@ -94,17 +94,26 @@ end
 
 function EEex_Resource_Fetch(resref, extension)
 	local toReturn
-	EEex_RunWithStack(CRes.sizeof + #resref + 1, function(rsp)
+	local resrefLen = #resref + 1
+	EEex_RunWithStack(CRes.sizeof + resrefLen + EEex_PtrSize, function(rsp)
 
-		local resObj = EEex_PtrToUD(rsp, "CRes")
+		local curRspOffset = rsp
+
+		local resObj = EEex_PtrToUD(curRspOffset, "CRes")
 		resObj:Construct()
+		resObj.type = EEex_Resource_ExtToType(extension)
+
+		curRspOffset = curRspOffset + CRes.sizeof
 		local resrefStr = EEex_CastUD(resObj.resref, "CharString")
-		resrefStr:pointTo(rsp + CRes.sizeof)
+		resrefStr:pointTo(curRspOffset)
 		resrefStr:write(resref)
-		resObj.type = EEex_Resource_ExtToType(extension)
+
+		curRspOffset = curRspOffset + resrefLen
+		local ptrToResObj = EEex_PtrToUD(curRspOffset, "Pointer<CRes>")
+		ptrToResObj.reference = resObj
 
 		toReturn = EngineGlobals.bsearch(
-			resObj:getInternalReference(),
+			ptrToResObj,
 			EngineGlobals.resources.m_pData,
 			EngineGlobals.resources.m_nSize,
 			EEex_PointerSize,

diff --git a/EEex/copy/EEex_Sprite.lua b/EEex/copy/EEex_Sprite.lua
@@ -802,10 +802,11 @@ CGameSprite.openOp214Interface = EEex_Sprite_OpenOp214Interface
 
 function EEex_Sprite_GetLauncher(sprite, curAbility)
 	return EEex_RunWithStackManager({
-		{ ["name"] = "launcherSlot", ["struct"] = "uninitialized", ["constructor"] = { ["args"] = {2} } } },
+		{ ["name"] = "launcherSlot", ["struct"] = "Primitive<short>" } },
 		function(manager)
-			local launcherSlotPtr = EEex_NewUDPtr(manager:getAddress("launcherSlot"), "short")
-			return sprite:GetLauncher(curAbility, launcherSlotPtr), launcherSlotPtr:getValue()
+			local launcherSlot = manager:getUD("launcherSlot")
+			local launcher = sprite:GetLauncher(curAbility, launcherSlot)
+			return launcher, launcher and launcherSlot.value or -1
 		end
 	)
 end

diff --git a/EEex/loader/EEex.dll b/EEex/loader/EEex.dll
diff --git a/EEex/loader/InfinityLoader.exe b/EEex/loader/InfinityLoader.exe
diff --git a/EEex/loader/InfinityLoaderCommon.dll b/EEex/loader/InfinityLoaderCommon.dll
diff --git a/EEex/loader/InfinityLoaderDLL.dll b/EEex/loader/InfinityLoaderDLL.dll
diff --git a/EEex/loader/Lua52/LuaProvider.dll b/EEex/loader/Lua52/LuaProvider.dll
diff --git a/EEex/loader/LuaBindings-v2.6.6.0.dll b/EEex/loader/LuaBindings-v2.6.6.0.dll
diff --git a/EEex/loader/LuaBindingsCore.dll b/EEex/loader/LuaBindingsCore.dll
diff --git a/EEex/loader/LuaJIT/LuaProvider.dll b/EEex/loader/LuaJIT/LuaProvider.dll
diff --git a/package_mod.bat b/package_mod.bat
@@ -6,7 +6,7 @@ call "%~dp0..\ModPackaging\utilities\ie_games.bat"
 
 REM /* MODIFY: set the values of the 3 variables below to reflect the current mod version */
 set "mod_name=EEex"
-set "mod_version=devel"
+set "mod_version=v0.10.2-alpha"
 set mod_folder=EEex
 
 REM /* MODIFY: list here which IE games the mod is compatible with, from this list of possibilities: */

diff --git a/pdb/EEex.pdb b/pdb/EEex.pdb
diff --git a/pdb/InfinityLoader.pdb b/pdb/InfinityLoader.pdb
diff --git a/pdb/InfinityLoaderCommon.pdb b/pdb/InfinityLoaderCommon.pdb
diff --git a/pdb/InfinityLoaderDLL.pdb b/pdb/InfinityLoaderDLL.pdb
diff --git a/pdb/Lua52/LuaProvider.pdb b/pdb/Lua52/LuaProvider.pdb
diff --git a/pdb/LuaBindings-v2.6.6.0.pdb b/pdb/LuaBindings-v2.6.6.0.pdb
diff --git a/pdb/LuaBindingsCore.pdb b/pdb/LuaBindingsCore.pdb
diff --git a/pdb/LuaJIT/LuaProvider.pdb b/pdb/LuaJIT/LuaProvider.pdb