Build and keyboard handler fix

Fixed the ResetKeyState not being recognized
cvs0 · Mar 31, 2024 · 2dbe3c1 · 2dbe3c1
1 parent 5a63fd3
commit 2dbe3c1
Show file tree

Hide file tree

Showing 19 changed files with 16 additions and 17 deletions.
diff --git a/.vs/NativeTrainer/v17/.suo b/.vs/NativeTrainer/v17/.suo
diff --git a/.vs/NativeTrainer/v17/Browse.VC.db b/.vs/NativeTrainer/v17/Browse.VC.db
diff --git a/NativeTrainer/bin/Release/NativeTrainer.asi b/NativeTrainer/bin/Release/NativeTrainer.asi
diff --git a/NativeTrainer/keyboard.cpp b/NativeTrainer/keyboard.cpp
@@ -46,6 +46,13 @@ bool IsKeyDownLong(DWORD key)
     return (GetTickCount64() < keyStates[key].time + MAX_DOWN_LONG) && !keyStates[key].isUpNow;
 }
 
+void ResetKeyState(DWORD key)
+{
+    if (key >= 0 && key < KEYS_SIZE)
+        memset(&keyStates[key], 0, sizeof(KeyState));
+}
+
+
 bool IsKeyJustUp(DWORD key, bool exclusive)
 {
     if (key < 0 || key >= KEYS_SIZE)
@@ -56,10 +63,4 @@ bool IsKeyJustUp(DWORD key, bool exclusive)
         ResetKeyState(key);
 
     return isJustUp;
-}
-
-void ResetKeyState(DWORD key)
-{
-    if (key >= 0 && key < KEYS_SIZE)
-        memset(&keyStates[key], 0, sizeof(KeyState));
-}
+}
diff --git a/NativeTrainer/tmp/Release/NativeTrainer.iobj b/NativeTrainer/tmp/Release/NativeTrainer.iobj
diff --git a/NativeTrainer/tmp/Release/NativeTrainer.ipdb b/NativeTrainer/tmp/Release/NativeTrainer.ipdb
diff --git a/NativeTrainer/tmp/Release/NativeTrainer.log b/NativeTrainer/tmp/Release/NativeTrainer.log
@@ -1,13 +1,8 @@
-  script.cpp
-C:\Users\cvs0_\Desktop\rdr2_modding\scripthookrdr2\projects\cvsTrainer\NativeTrainer\scriptmenu.h(246,65): warning C4244: '=': conversion from 'ULONGLONG' to 'DWORD', possible loss of data
-  (compiling source file 'script.cpp')
-
-C:\Users\cvs0_\Desktop\rdr2_modding\scripthookrdr2\projects\cvsTrainer\NativeTrainer\script.cpp(1066,35): warning C4244: '=': conversion from 'ULONGLONG' to 'DWORD', possible loss of data
-C:\Users\cvs0_\Desktop\rdr2_modding\scripthookrdr2\projects\cvsTrainer\NativeTrainer\script.cpp(1606,22): warning C4244: 'argument': conversion from 'ULONGLONG' to 'unsigned int', possible loss of data
+  keyboard.cpp
+C:\Users\cvs0_\Desktop\rdr2_modding\scripthookrdr2\projects\cvsTrainer\NativeTrainer\keyboard.cpp(24,45): warning C4244: '=': conversion from 'ULONGLONG' to 'DWORD', possible loss of data
   Generating code
-  16 of 1046 functions ( 1.5%) were compiled, the rest were copied from previous compilation.
-    11 functions were new in current compilation
-    82 functions had inline decision re-evaluated but remain unchanged
+  Previous IPDB was built with incompatible compiler, fall back to full compilation.
+  All 1056 functions were compiled because no usable IPDB/IOBJ from previous compilation was found.
   Finished generating code
   NativeTrainer.vcxproj -> C:\Users\cvs0_\Desktop\rdr2_modding\scripthookrdr2\projects\cvsTrainer\NativeTrainer\bin\Release\NativeTrainer.asi
   'pwsh.exe' is not recognized as an internal or external command,

diff --git a/NativeTrainer/tmp/Release/NativeTrainer.tlog/CL.command.1.tlog b/NativeTrainer/tmp/Release/NativeTrainer.tlog/CL.command.1.tlog
diff --git a/NativeTrainer/tmp/Release/NativeTrainer.tlog/CL.read.1.tlog b/NativeTrainer/tmp/Release/NativeTrainer.tlog/CL.read.1.tlog
diff --git a/NativeTrainer/tmp/Release/NativeTrainer.tlog/CL.write.1.tlog b/NativeTrainer/tmp/Release/NativeTrainer.tlog/CL.write.1.tlog
diff --git a/NativeTrainer/tmp/Release/NativeTrainer.tlog/NativeTrainer.lastbuildstate b/NativeTrainer/tmp/Release/NativeTrainer.tlog/NativeTrainer.lastbuildstate
@@ -1,2 +1,2 @@
-PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.38.33130:TargetPlatformVersion=10.0.22621.0:VcpkgTriplet=x64-windows:
+PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.39.33519:TargetPlatformVersion=10.0.22621.0:VcpkgTriplet=x64-windows:
 Release|x64|C:\Users\cvs0_\Desktop\rdr2_modding\scripthookrdr2\projects\cvsTrainer\|
diff --git a/NativeTrainer/tmp/Release/NativeTrainer.tlog/link.read.1.tlog b/NativeTrainer/tmp/Release/NativeTrainer.tlog/link.read.1.tlog
diff --git a/NativeTrainer/tmp/Release/NativeTrainer.tlog/link.secondary.1.tlog b/NativeTrainer/tmp/Release/NativeTrainer.tlog/link.secondary.1.tlog
@@ -0,0 +1,3 @@
+^C:\USERS\CVS0_\DESKTOP\RDR2_MODDING\SCRIPTHOOKRDR2\PROJECTS\CVSTRAINER\NATIVETRAINER\TMP\RELEASE\KEYBOARD.OBJ|C:\USERS\CVS0_\DESKTOP\RDR2_MODDING\SCRIPTHOOKRDR2\PROJECTS\CVSTRAINER\NATIVETRAINER\TMP\RELEASE\MAIN.OBJ|C:\USERS\CVS0_\DESKTOP\RDR2_MODDING\SCRIPTHOOKRDR2\PROJECTS\CVSTRAINER\NATIVETRAINER\TMP\RELEASE\SCRIPT.OBJ|C:\USERS\CVS0_\DESKTOP\RDR2_MODDING\SCRIPTHOOKRDR2\PROJECTS\CVSTRAINER\NATIVETRAINER\TMP\RELEASE\SCRIPTMENU.OBJ
+C:\Users\cvs0_\Desktop\rdr2_modding\scripthookrdr2\projects\cvsTrainer\NativeTrainer\tmp\Release\NativeTrainer.IPDB
+C:\Users\cvs0_\Desktop\rdr2_modding\scripthookrdr2\projects\cvsTrainer\NativeTrainer\tmp\Release\NativeTrainer.iobj
diff --git a/NativeTrainer/tmp/Release/NativeTrainer.tlog/link.write.1.tlog b/NativeTrainer/tmp/Release/NativeTrainer.tlog/link.write.1.tlog
diff --git a/NativeTrainer/tmp/Release/keyboard.obj b/NativeTrainer/tmp/Release/keyboard.obj
diff --git a/NativeTrainer/tmp/Release/main.obj b/NativeTrainer/tmp/Release/main.obj
diff --git a/NativeTrainer/tmp/Release/script.obj b/NativeTrainer/tmp/Release/script.obj
diff --git a/NativeTrainer/tmp/Release/scriptmenu.obj b/NativeTrainer/tmp/Release/scriptmenu.obj
diff --git a/NativeTrainer/tmp/Release/vc143.pdb b/NativeTrainer/tmp/Release/vc143.pdb