From d1a2aba3c3bc211b773c9c44dee2eeb385378b81 Mon Sep 17 00:00:00 2001 From: Grinch_ Date: Sun, 30 Jun 2024 00:21:49 +0600 Subject: [PATCH] Revert changes to ImGui::Begin() --- src/opcodemgr.cpp | 2 +- tools/Debug.bat | 8 ++++---- tools/Debug64.bat | 8 ++++---- tools/DebugCleo.bat | 8 ++++---- tools/Release.bat | 4 ++-- tools/Release64.bat | 4 ++-- tools/ReleaseCleo.bat | 4 ++-- tools/Setup.bat | 5 +---- 8 files changed, 20 insertions(+), 23 deletions(-) diff --git a/src/opcodemgr.cpp b/src/opcodemgr.cpp index fdaa958..baed65a 100644 --- a/src/opcodemgr.cpp +++ b/src/opcodemgr.cpp @@ -29,7 +29,7 @@ static RTN_TYPE RUNTIME_API ImGuiBegin(RUNTIME_CONTEXT ctx) { data->SetData(label, 0, isOpen); }; data->imgui.lastScriptCall = time(NULL); - wUpdateCompareFlag(ctx, data->GetData(label, 0, true)); + wSetIntParam(ctx, data->GetData(label, 0, true)); return RTN_CONTINUE; } diff --git a/tools/Debug.bat b/tools/Debug.bat index dc32a7d..8294551 100644 --- a/tools/Debug.bat +++ b/tools/Debug.bat @@ -5,7 +5,7 @@ echo -------------------------------------------------- echo[ call "tools\Setup.bat" MsBuild ImGuiRedux.sln /property:Configuration=Debug /t:ImGuiRedux /property:Platform=Win32 -del %OUT_DIR%"\cleo\CLEO_PLUGINS\ImGuiReduxWin32.cleo" /Q -del %OUT_DIR%"\cleo\CLEO_PLUGINS\ImGuiReduxWin32.pdb" /Q -xcopy /s "bin\ImGuiReduxWin32.cleo" %OUT_DIR%"\cleo\CLEO_PLUGINS\" /K /D /H /Y -xcopy /s "bin\ImGuiReduxWin32.pdb" %OUT_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 diff --git a/tools/Debug64.bat b/tools/Debug64.bat index d6bf355..04cffc6 100644 --- a/tools/Debug64.bat +++ b/tools/Debug64.bat @@ -5,7 +5,7 @@ echo -------------------------------------------------- echo[ call "tools\Setup.bat" MsBuild ImGuiRedux.sln /property:Configuration=Release /t:ImGuiRedux /property:Platform=Win64 -del %OUT_DIR%"\cleo\CLEO_PLUGINS\ImGuiReduxWin64.cleo" /Q -del %OUT_DIR%"\cleo\CLEO_PLUGINS\ImGuiReduxWin64.pdb" /Q -xcopy /s "bin\ImGuiReduxWin64.cleo" %OUT_DIR%"\cleo\CLEO_PLUGINS\" /K /D /H /Y -xcopy /s "bin\ImGuiReduxWin64.pdb" %OUT_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 diff --git a/tools/DebugCleo.bat b/tools/DebugCleo.bat index 9f94159..d3ac73b 100644 --- a/tools/DebugCleo.bat +++ b/tools/DebugCleo.bat @@ -5,7 +5,7 @@ echo -------------------------------------------------- echo[ call "tools\Setup.bat" MsBuild ImGuiRedux.sln /property:Configuration=DebugCleo /t:ImGuiRedux /property:Platform=Win32 -del %OUT_DIR%"\cleo\CLEO_PLUGINS\ImGuiCleoWin32.cleo" /Q -del %OUT_DIR%"\cleo\CLEO_PLUGINS\ImGuiCleoWin32.pdb" /Q -xcopy /s "bin\ImGuiCleoWin32.cleo" %OUT_DIR%"\cleo\CLEO_PLUGINS\" /K /D /H /Y -xcopy /s "bin\ImGuiCleoWin32.pdb" %OUT_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 diff --git a/tools/Release.bat b/tools/Release.bat index b6c712a..e6428d9 100644 --- a/tools/Release.bat +++ b/tools/Release.bat @@ -5,5 +5,5 @@ echo -------------------------------------------------- echo[ call "tools\Setup.bat" MsBuild ImGuiRedux.sln /property:Configuration=Release /t:ImGuiRedux /property:Platform=Win32 -del %OUT_DIR%"\cleo\CLEO_PLUGINS\ImGuiReduxWin32.cleo" /Q -xcopy /s "bin\ImGuiReduxWin32.cleo" %OUT_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 diff --git a/tools/Release64.bat b/tools/Release64.bat index 389227d..c0c9e02 100644 --- a/tools/Release64.bat +++ b/tools/Release64.bat @@ -5,5 +5,5 @@ echo -------------------------------------------------- echo[ call "tools\Setup.bat" MsBuild ImGuiRedux.sln /property:Configuration=Release /t:ImGuiRedux /property:Platform=Win64 -del %OUT_DIR%"\cleo\CLEO_PLUGINS\ImGuiReduxWin64.cleo" /Q -xcopy /s "bin\ImGuiReduxWin64.cleo" %OUT_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 diff --git a/tools/ReleaseCleo.bat b/tools/ReleaseCleo.bat index bdd211d..92a1a9d 100644 --- a/tools/ReleaseCleo.bat +++ b/tools/ReleaseCleo.bat @@ -5,5 +5,5 @@ echo -------------------------------------------------- echo[ call "tools\Setup.bat" MsBuild ImGuiRedux.sln /property:Configuration=ReleaseCleo /t:ImGuiRedux /property:Platform=Win32 -del %OUT_DIR%"\cleo\CLEO_PLUGINS\ImGuiReduxWin32.cleo" /Q -xcopy /s "bin\ImGuiReduxWin32.cleo" %OUT_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 diff --git a/tools/Setup.bat b/tools/Setup.bat index 74df4b2..e891260 100644 --- a/tools/Setup.bat +++ b/tools/Setup.bat @@ -1,10 +1,7 @@ rem Generate visual studio files and run the devcmd init @echo off - rem Set game paths below -set "OUT_DIR="H:/GTA San Andreas"" - cd tools premake5.exe vs2022 cd ../build -call "C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\VsDevCmd.bat" +call "C:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\Tools\VsDevCmd.bat"