diff --git a/src/opcodemgr.cpp b/src/opcodemgr.cpp index dfd8c76..b9c2a5c 100644 --- a/src/opcodemgr.cpp +++ b/src/opcodemgr.cpp @@ -31,7 +31,7 @@ static RTN_TYPE RUNTIME_API ImGuiBegin(RUNTIME_CONTEXT ctx) { } }; data->imgui.lastScriptCall = time(NULL); - wUpdateCompareFlag(ctx, data->GetData(label, 0, false)); + wSetIntParam(ctx, data->GetData(label, 0, true)); return RTN_CONTINUE; } diff --git a/tools/Debug.bat b/tools/Debug.bat index 776705c..4e0aa7d 100644 --- a/tools/Debug.bat +++ b/tools/Debug.bat @@ -5,7 +5,14 @@ echo -------------------------------------------------- echo[ call "tools\Setup.bat" MsBuild ImGuiRedux.sln /property:Configuration=Debug /t:ImGuiRedux /property:Platform=Win32 +<<<<<<< HEAD del "%GTA_SA_DIR%\cleo\CLEO_PLUGINS\ImGuiReduxWin32.cleo" /Q del "%GTA_SA_DIR%\cleo\CLEO_PLUGINS\ImGuiReduxWin32.pdb" /Q xcopy /s "bin\ImGuiReduxWin32.cleo" "%GTA_SA_DIR%\cleo\CLEO_PLUGINS\" /K /D /H /Y xcopy /s "bin\ImGuiReduxWin32.pdb" "%GTA_SA_DIR%\cleo\CLEO_PLUGINS\" /K /D /H /Y +======= +del "%SA_DIR%\cleo\CLEO_PLUGINS\ImGuiReduxWin32.cleo" /Q +del "%SA_DIR%\cleo\CLEO_PLUGINS\ImGuiReduxWin32.pdb" /Q +xcopy /s "bin\ImGuiReduxWin32.cleo" "%SA_DIR%\cleo\CLEO_PLUGINS\" /K /D /H /Y +xcopy /s "bin\ImGuiReduxWin32.pdb" "%SA_DIR%\cleo\CLEO_PLUGINS\" /K /D /H /Y +>>>>>>> d1a2aba3c3bc211b773c9c44dee2eeb385378b81 diff --git a/tools/Debug64.bat b/tools/Debug64.bat index 469d80d..14a650e 100644 --- a/tools/Debug64.bat +++ b/tools/Debug64.bat @@ -5,7 +5,14 @@ echo -------------------------------------------------- echo[ call "tools\Setup.bat" MsBuild ImGuiRedux.sln /property:Configuration=Release /t:ImGuiRedux /property:Platform=Win64 +<<<<<<< HEAD del "%GTA_SA_DIR%\cleo\CLEO_PLUGINS\ImGuiReduxWin64.cleo" /Q del "%GTA_SA_DIR%\cleo\CLEO_PLUGINS\ImGuiReduxWin64.pdb" /Q xcopy /s "bin\ImGuiReduxWin64.cleo" "%GTA_SA_DIR%\cleo\CLEO_PLUGINS\" /K /D /H /Y xcopy /s "bin\ImGuiReduxWin64.pdb" "%GTA_SA_DIR%\cleo\CLEO_PLUGINS\" /K /D /H /Y +======= +del "%SA_DIR%\cleo\CLEO_PLUGINS\ImGuiReduxWin64.cleo" /Q +del "%SA_DIR%\cleo\CLEO_PLUGINS\ImGuiReduxWin64.pdb" /Q +xcopy /s "bin\ImGuiReduxWin64.cleo" "%SA_DIR%\cleo\CLEO_PLUGINS\" /K /D /H /Y +xcopy /s "bin\ImGuiReduxWin64.pdb" "%SA_DIR%\cleo\CLEO_PLUGINS\" /K /D /H /Y +>>>>>>> d1a2aba3c3bc211b773c9c44dee2eeb385378b81 diff --git a/tools/DebugCleo.bat b/tools/DebugCleo.bat index c5c9cd5..f4f2b80 100644 --- a/tools/DebugCleo.bat +++ b/tools/DebugCleo.bat @@ -5,7 +5,14 @@ echo -------------------------------------------------- echo[ call "tools\Setup.bat" MsBuild ImGuiRedux.sln /property:Configuration=DebugCleo /t:ImGuiRedux /property:Platform=Win32 +<<<<<<< HEAD del "%GTA_SA_DIR%\cleo\CLEO_PLUGINS\ImGuiCleoWin32.cleo" /Q del "%GTA_SA_DIR%\cleo\CLEO_PLUGINS\ImGuiCleoWin32.pdb" /Q xcopy /s "bin\ImGuiCleoWin32.cleo" "%GTA_SA_DIR%\cleo\CLEO_PLUGINS\" /K /D /H /Y xcopy /s "bin\ImGuiCleoWin32.pdb" "%GTA_SA_DIR%\cleo\CLEO_PLUGINS\" /K /D /H /Y +======= +del "%SA_DIR%\cleo\CLEO_PLUGINS\ImGuiCleoWin32.cleo" /Q +del "%SA_DIR%\cleo\CLEO_PLUGINS\ImGuiCleoWin32.pdb" /Q +xcopy /s "bin\ImGuiCleoWin32.cleo" "%SA_DIR%\cleo\CLEO_PLUGINS\" /K /D /H /Y +xcopy /s "bin\ImGuiCleoWin32.pdb" "%SA_DIR%\cleo\CLEO_PLUGINS\" /K /D /H /Y +>>>>>>> d1a2aba3c3bc211b773c9c44dee2eeb385378b81 diff --git a/tools/Release.bat b/tools/Release.bat index 5c82e12..7f6298a 100644 --- a/tools/Release.bat +++ b/tools/Release.bat @@ -5,5 +5,10 @@ echo -------------------------------------------------- echo[ call "tools\Setup.bat" MsBuild ImGuiRedux.sln /property:Configuration=Release /t:ImGuiRedux /property:Platform=Win32 +<<<<<<< HEAD del "%GTA_SA_DIR%\cleo\CLEO_PLUGINS\ImGuiReduxWin32.cleo" /Q xcopy /s "bin\ImGuiReduxWin32.cleo" "%GTA_SA_DIR%\cleo\CLEO_PLUGINS\" /K /D /H /Y +======= +del "%SA_DIR%\cleo\CLEO_PLUGINS\ImGuiReduxWin32.cleo" /Q +xcopy /s "bin\ImGuiReduxWin32.cleo" "%SA_DIR%\cleo\CLEO_PLUGINS\" /K /D /H /Y +>>>>>>> d1a2aba3c3bc211b773c9c44dee2eeb385378b81 diff --git a/tools/Release64.bat b/tools/Release64.bat index a926dc2..d055848 100644 --- a/tools/Release64.bat +++ b/tools/Release64.bat @@ -5,5 +5,10 @@ echo -------------------------------------------------- echo[ call "tools\Setup.bat" MsBuild ImGuiRedux.sln /property:Configuration=Release /t:ImGuiRedux /property:Platform=Win64 +<<<<<<< HEAD del "%GTA_SA_DIR%\cleo\CLEO_PLUGINS\ImGuiReduxWin64.cleo" /Q xcopy /s "bin\ImGuiReduxWin64.cleo" "%GTA_SA_DIR%\cleo\CLEO_PLUGINS\" /K /D /H /Y +======= +del "%SA_DIR%\cleo\CLEO_PLUGINS\ImGuiReduxWin64.cleo" /Q +xcopy /s "bin\ImGuiReduxWin64.cleo" "%SA_DIR%\cleo\CLEO_PLUGINS\" /K /D /H /Y +>>>>>>> d1a2aba3c3bc211b773c9c44dee2eeb385378b81 diff --git a/tools/ReleaseCleo.bat b/tools/ReleaseCleo.bat index 49cd68b..641d717 100644 --- a/tools/ReleaseCleo.bat +++ b/tools/ReleaseCleo.bat @@ -5,5 +5,10 @@ echo -------------------------------------------------- echo[ call "tools\Setup.bat" MsBuild ImGuiRedux.sln /property:Configuration=ReleaseCleo /t:ImGuiRedux /property:Platform=Win32 +<<<<<<< HEAD del "%GTA_SA_DIR%\cleo\CLEO_PLUGINS\ImGuiReduxWin32.cleo" /Q xcopy /s "bin\ImGuiReduxWin32.cleo" "%GTA_SA_DIR%\cleo\CLEO_PLUGINS\" /K /D /H /Y +======= +del "%SA_DIR%\cleo\CLEO_PLUGINS\ImGuiReduxWin32.cleo" /Q +xcopy /s "bin\ImGuiReduxWin32.cleo" "%SA_DIR%\cleo\CLEO_PLUGINS\" /K /D /H /Y +>>>>>>> d1a2aba3c3bc211b773c9c44dee2eeb385378b81 diff --git a/tools/Setup.bat b/tools/Setup.bat index c406e72..db65436 100644 --- a/tools/Setup.bat +++ b/tools/Setup.bat @@ -1,4 +1,5 @@ @echo off +<<<<<<< HEAD set "projectdir=%CD%" set "PLUGIN_NAME="GrinchTrainer"" @@ -44,4 +45,11 @@ premake5.exe vs2022 :run_dev cd "%projectdir%\build" -call %vs_path%"\Common7\Tools\VsDevCmd.bat" \ No newline at end of file +call %vs_path%"\Common7\Tools\VsDevCmd.bat" +======= +rem Set game paths below +cd tools +premake5.exe vs2022 +cd ../build +call "C:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\Tools\VsDevCmd.bat" +>>>>>>> d1a2aba3c3bc211b773c9c44dee2eeb385378b81