Fix build

.github/workflows/build.yml

@@ -26,7 +26,7 @@ jobs:
         tar -xf lib.zip
 
     - name: Generate project files
-      run: .\premake5 vs2019
+      run: .\premake5 vs2022
 
     # compile
     - name: Build Anniversary
@@ -38,9 +38,6 @@ jobs:
     - name: Build Legend
       run: MSBuild /p:Configuration=Release /p:Platform=TR7
 
-    - name: Build Legend Nextgen Demo
-      run: MSBuild /p:Configuration=Release /p:Platform=TR7DEBUG
-
     # upload
     - uses: actions/upload-artifact@v3
       with:
@@ -62,10 +59,3 @@ jobs:
         path: |
           bin/TR7/Release/TR7-Menu-Hook.asi
           bin/TR7/Release/TR7-Menu-Hook.pdb
-
-    - uses: actions/upload-artifact@v3
-      with:
-        name: Legend Nextgen Demo
-        path: |
-          bin/TR7DEBUG/Release/TR7DEBUG-Menu-Hook.asi
-          bin/TR7DEBUG/Release/TR7DEBUG-Menu-Hook.pdb

premake5.lua

@@ -1,6 +1,7 @@
 workspace "TRAE-menu-hook"
     architecture "x86"
     configurations { "Debug", "Release" }
+    platforms { "TR7", "TRAE", "TR8" }
 
 project "TRAE-menu-hook"
     kind "SharedLib"
@@ -32,6 +33,8 @@ project "TRAE-menu-hook"
         "vendor/json/include"
     }
 
+    defines { "IMGUI_IMPL_WIN32_DISABLE_GAMEPAD" }
+
     -- Build configurations
     symbols "On"
 
@@ -40,4 +43,17 @@ project "TRAE-menu-hook"
 
     filter "configurations:Release"
         defines { "NDEBUG" }
-        optimize "On"
+        optimize "On"
+
+    -- Game configurations
+    filter "platforms:TR7"
+        defines { "TR7" }
+        targetname "TR7-Menu-Hook"
+
+    filter "platforms:TRAE"
+        defines { "TRAE" }
+        targetname "TRAE-Menu-Hook"
+
+    filter "platforms:TR8"
+        defines { "TR8" }
+        targetname "TR8-Menu-Hook"

src/Hook.cpp

@@ -11,8 +11,8 @@
 #include "modules/MainMenu.h"
 #include "modules/InstanceViewer.h"
 #include "modules/Skew.h"
-#include "modules/Render.h"
-#include "modules/Draw.h"
+//#include "modules/Render.h"
+//#include "modules/Draw.h"
 #include "modules/Log.h"
 #include "modules/ScriptLog.h"
 
@@ -116,8 +116,8 @@ void Hook::RegisterModules()
 	RegisterModule<Skew>();
 
 #ifndef TR8
-	RegisterModule<Render>();
-	RegisterModule<Draw>();
+	//RegisterModule<Render>();
+	//RegisterModule<Draw>();
 #else
 	RegisterModule<ScriptLog>();
 #endif

src/game/Game.h

@@ -46,8 +46,11 @@ struct GameTracker
 	char gameMode;
 	char cheatMode;
 	char savingGame;
+	__int16 postSaveScreenID;
 
-	char pad1[66];
+	int StreamUnitID;
+
+	char pad1[60];
 
 	float timeMult;
 };

src/util/Hooking.h

@@ -34,7 +34,7 @@ class Hooking
 };
 
 #if TR7
-#define GET_ADDRESS(tr7, trae, tr8) trl
+#define GET_ADDRESS(tr7, trae, tr8) tr7
 #elif TRAE
 #define GET_ADDRESS(tr7, trae, tr8) trae
 #elif TR8