From 8c24fd1b28ff34c61df5e340f2a3e94755f6512f Mon Sep 17 00:00:00 2001 From: Grinch_ Date: Thu, 1 Aug 2024 23:30:59 -0600 Subject: [PATCH] Bug fixes --- .vscode/c_cpp_properties.json | 2 +- examples/cleo5/imgui_test.cs | Bin 11802 -> 11462 bytes src/dllmain.cpp | 92 +++++++++++++++++++++------------- src/hook.cpp | 8 +-- src/opcodemgr.cpp | 37 ++------------ src/pch.h | 3 +- src/scriptextender.hpp | 2 + tools/Debug.bat | 7 --- tools/Debug64.bat | 7 --- tools/DebugCleo.bat | 7 --- tools/Release.bat | 5 -- tools/Release64.bat | 5 -- tools/ReleaseCleo.bat | 5 -- tools/Setup.bat | 8 --- 14 files changed, 71 insertions(+), 117 deletions(-) diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 9f25679..aa1153d 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -10,7 +10,7 @@ "defines": [ "_DEBUG", "_DX9_SDK_INSTALLED", - "RUNTIME_REDUX", + "RUNTIME_CLEO", ], "windowsSdkVersion": "10.0.19041.0", "compilerPath": "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.29.30037/bin/Hostx64/x64/cl.exe", diff --git a/examples/cleo5/imgui_test.cs b/examples/cleo5/imgui_test.cs index 6eed7c73b936bf97ae52773f0ea28b7a35a59db8..94d48c852ac50b8570eaa730babfc4030c457267 100644 GIT binary patch delta 2249 zcmZ`*Uu;uV7{9mowp+XP_Rnb7ZUqmwBa^OW>p&dnfOcC+&B{hw1q?VldRs5Hy-j;7 zMWbk<3GqeXi#`|wzUc!AkQ!bzkthE})Mzw52t)&kKKQUmNYrTk&b@8dL2R1uobUJj z|IT+#`}W~a4n<51$1psD3#%^%hG&uEbdJ{-BZ5<+U_V-rl*3XzQ!E#xEyv1v&cvLF zc%A6t2UOgl`C=0c`~I0i;H2i5I^ZcD6S*E{PUL!-S&=g{V`9q!!%~YM|7|wEH90Jd zz-$(I!*>?CHOGs4Yw}LADT`)|AR?vTHmnb+>&nU-uC| z1#6^ILDS`$sw$-_N`Ho1?EJ~I|1_JTC~(PWn4_&lGAio8Bn1pzz*Y)yNIFh!Nhx0| zWGY>5Y0!iy7*Z3w0UK*$IJ;Jq2UFOmREn8GOIZ^cX_X>;VAx^Bv(mK@xek9BM(moK zFweE!z@r?obaY;X92Z+=y$&XROG_$Wc>#zbN$2C` zV)Ag99K2@|U7V4@Z);?+6b?)IrE$Y_gl*NvBX9v?y=jv^P4I4SX!3un5|T=-l$EmG zM@3KSE?CWb9GyBZ+-)|$vu^O3y_zm8#2$rs;rdarJT}* zCNo)CiK-=p!YxI(+UIu3ixufPy_i)O@Oz(!l^Z?%c7vxY$Y!g>Y9aWMb3}%)u*}Nv zrZ9>0bHQ)Yf+yjQ5Y)GE@Y@0gIR*>1Xn%KBa3)0DWL_!dQ))#nMC`muVvxx3V!lRwz>3oa->f$pH5>TKCJwjM*SuBKBv!88qfKqWIRw{j18pn% zgwYp_8YHD`t$u%u6=wpPo?cjTj2q-MoOUGWa?|k?*1g+Ft3UrBp?-09(YX!jZD)>` z)0t&jXhRv8G9cz~6JwZ0fv;VAG=2o>!)|>~j9WF?dG|ScuApR8l1n{*Fi7bk*tO9E z^FD`j0#zo1WI}^AA*}dZaMfpn*9V=wZ3_e=aC`6#J2nl+a*cKrKJ^rOTCU+5@xfc( zeQPa4L+9=VtndYAg)PIc-Y*#9t#EA24KMq6823$eE4W~BqY2N-gpbytj-avP`;5f~ zHa^@?XI*QDpswmeFzxb9jgOOfR>~9#C&&qRe8$=mSZI zl76ab*iH_16`1Y>hHzjMGy3RWzzGTQGBiamn?LLKu**n%8U5nuK6P3Nl6;UX2MHAY zDf23K&7T;=S*)v_%h9%yAv!XPXMAd8tdC9unVu$FtroaEI0WT^^=AjP<}}z%W&`a< z|L74Gwc8VQr>ls);0@Tj^S;r|?1cSeKMmw&rGiTHPRA2-$p{JIq(y=cte3UBJ*WSf xAiL-*(M~Wo3oiv9$C%#-FCh&JE_f&8!d)X2KzcJY-v0;w<}WR!qOo+6`41|%FXaFL delta 2649 zcmb_cYitx%6uvXFUAIeT`rOjTwhp%geQlvzKwBQ#-O^%XTk38>FeU9SJ1wibJ9T#o z4K^tx;@iaL#2EQOBr%cr1JVBUhw+CdiadOwf`~DMsKm$*G$uyIb9eSJZ3*#*o7sEr z`Of2>bMCq4<2}bleKx{32{wYnW0H2k#v!-C2C_0xj31SWK!=SiauxQPKZG*F1 z9rrWb;089n{*Pf$DhUC)ZY|j6o{#!FC&u6(1M) zNIJ?YDv3i{G9HS_;b~ph5~c{xZHD*xE)k2KL#_cQDD`RUbe$tCJ?7JE!=0%H8wJ^! zvp4`_LSLR;1MgVbi(m+AGg664Ziv;oA!w_}8-(FW+kKoDPTE>l;DuvFc#O;oS8Pwg zSb@v$+>dv=EFfF3-P^G&%@qMPrOW+^scAix3$PJR7Ifv$y9_r9I_J>gl-Y{9NoGtk zi==@{MLk+fOUlF1eNU)K)Z}%6pAq<3p_WRHo*e@_0{)R9D{d#`B|k1VeQPKZLU56N zm~qjFI-|=`7SblUl1c?VT0E@5YxZgvzeT_=)3%tmfO&ti@R5Blmnnn|fuqpo7_pm; z1+1MUfj`V5;i}A+isZ0R@LV|t&;_%F z?ztBT>IgDn(VlkNbQJvdhhb#46@MBA$KE{QT5y|53FiQ7?pvsbA~qFJ&a6z1L+%5^ zFn0L@qyj58$zIH((L_W$NIqr!E;X5oYKi{Dgf>UcFeDI)L^Z#jAfGXAggvfab9j)m z3>i+U2hu1x$JlhKgKA9Or=uToo?-p*(4wcO z;;wJNx1HE9(O{s5+y>4$)uUKambc37qBEM%WyPAf70zalm^Z5mr=68vC7-xee{uR& ztA$(6628WIe6#2joihHS6Bq!v#W0U#PV8XhJ+Z+t5z|5#TM{md9wDVfL6ll}Wdgb+ zKU0~NJYW>tp{2A6ev!&oDy()Mndas$^~lVsw3rs8WpGKN?yT0LA&i;|-T)jabvfAM zX-X+Nyi(ko)6ULhrkK6NrP@_+Pgy67mfX*y@v9|+g^C^u%UiL?V61+Sg~_7c)tJuj z`9>K|7S}N3-O>$=TrZtK!-b);$9TpTyJWkU9XAQ*D!NTX5tUp&dgKlWxyoU@)($1* z?ySjr)8v@zcv>=ES?f@+gV0Y3KCE=X%T>kjR%MwLyilr`Ey|QKswY;Sdf2Q!BIX6N zo3j2gx05=w=g#u1FD8dowN;R;8nPbigPYYNR94R~1&=QUM7UNnW(8fCo051@Wk7sTYZt-!Cf zN^*H!GRMFwTD@7p-eB+V4mAxemnccr3iuD>A2b>i7b9orU=y{@eJZ!gI<|7|m1WPt zhFaIKjrEJ((8@aQM8i((IDO%-)q6Px=Q{M(|5&lj*5Wk6&E|5bYkqSn`1>PDdU|30 zBmIND0iWE4S?5M9< diff --git a/src/dllmain.cpp b/src/dllmain.cpp index 46a829c..eb11b09 100644 --- a/src/dllmain.cpp +++ b/src/dllmain.cpp @@ -1,14 +1,62 @@ #include "pch.h" -#include #include "opcodemgr.h" #include "hook.h" #include "wrapper.hpp" -#ifdef RUNTIME_CLEO -#include "MinHook.h" -#include "injector.hpp" +#include +#include + +HINSTANCE gDllHandle; + +DWORD GetProcessIdFromModule(HMODULE hModule) { + DWORD processId = 0; + HANDLE hProcess = NULL; + MODULEINFO moduleInfo; + + hProcess = GetCurrentProcess(); + if (hProcess != NULL) { + if (GetModuleInformation(hProcess, hModule, &moduleInfo, sizeof(moduleInfo))) { + processId = GetProcessId(hProcess); + } + CloseHandle(hProcess); + } + + return processId; +} + +BOOL CALLBACK EnumWindowsProc(HWND hwnd, LPARAM lParam) { + DWORD processId = 0; + GetWindowThreadProcessId(hwnd, &processId); + + if (processId == static_cast(lParam)) { + return FALSE; // Stop + } + return TRUE; // Continue +} + +bool HasGameLaunched(HMODULE hModule, int maxRetries, int sleepDuration) { + DWORD processId = GetProcessIdFromModule(hModule); + if (processId == 0) { + MessageBox(NULL, "Failed to get process ID", "ImGuiRedux", MB_ICONERROR); + return false; + } + + int retries = 0; + while (retries < maxRetries) { + Sleep(sleepDuration); + if (!EnumWindows(EnumWindowsProc, static_cast(processId))) { + return true; + } + retries++; + } + MessageBox(NULL, "Failed to detect game window.", "ImGuiRedux", MB_ICONERROR); + return false; +} +void ImGuiThread(void* param) { + if (!HasGameLaunched(gDllHandle, 30, 5000)) { + return; + } -void f_GTA_SPCheck() { std::string moduleName = "SilentPatchSA.asi"; if (gGameVer == eGameVer::VC) { moduleName = "SilentPatchVC.asi"; @@ -23,29 +71,6 @@ void f_GTA_SPCheck() { }; return; } -} -#endif - -void ImGuiThread(void* param) { - -#ifdef RUNTIME_CLEO - /* - Need SP for mouse fixes - Only need for classics - TODO: Get the mouse patches from MTA later - */ - if (gGameVer <= eGameVer::SA) { - MH_Initialize(); - uint32_t addr = (gGameVer == eGameVer::SA) ? 0x5BF3A1 : - ((gGameVer == eGameVer::VC) ? 0x4A5B6B : 0x48D52F); - - void *ptr = NULL; - MH_CreateHook((void*)addr, f_GTA_SPCheck, &ptr); - MH_EnableHook(ptr); - } -#endif - - Sleep(5000); if (!Hook::Inject(&ScriptExData::DrawFrames)) { MessageBox(HWND_DESKTOP, "Failed to inject dxhook..", "ImGuiRedux", MB_ICONERROR); @@ -63,14 +88,11 @@ void __stdcall _wrapper(DWORD saveSlot) { BOOL WINAPI DllMain(HINSTANCE hDllHandle, DWORD nReason, LPVOID Reserved) { if (nReason == DLL_PROCESS_ATTACH) { #ifdef RUNTIME_CLEO - auto gvm = injector::game_version_manager(); - gvm.Detect(); - - if (gvm.GetMajorVersion() == 1 && gvm.GetMinorVersion() == 0) { - if (gvm.IsIII()) gGameVer = eGameVer::III; - if (gvm.IsVC()) gGameVer = eGameVer::VC; - if (gvm.IsSA()) gGameVer = eGameVer::SA; + CLEO::eGameVersion ver = CLEO::CLEO_GetGameVersion(); + if (ver != CLEO::eGameVersion::GV_US10) { + MessageBox(HWND_DESKTOP, "Unknown game/ version detected. gta_sa.exe v1.0 US required!", "ImGuiRedux", MB_ICONERROR); } + gGameVer = eGameVer::SA; #else if (GetModuleHandle("ImGuiCleoWin32.cleo")) { Log("ImGuiReduxWin32: ImGuiCleoWin32 detected. Closing..."); diff --git a/src/hook.cpp b/src/hook.cpp index 1c4f509..8e3fad3 100644 --- a/src/hook.cpp +++ b/src/hook.cpp @@ -77,7 +77,8 @@ void Hook::ProcessFrame(void* ptr) { // Scale the menu if game resolution changed static int height, width, RsGlobal; -#ifdef RUNTIME_CLEO + +#ifndef _WIN64 if (gGameVer == eGameVer::III) { RsGlobal = 0x8F4360; width = injector::ReadMemory(RsGlobal + 4, 0); // width @@ -96,12 +97,13 @@ void Hook::ProcessFrame(void* ptr) { width = rect.right - rect.left; height = rect.bottom - rect.top; } -#else +#else RECT rect; GetWindowRect(hwnd, &rect); width = rect.right - rect.left; height = rect.bottom - rect.top; #endif + static ImVec2 fScreenSize = ImVec2(-1, -1); if (fScreenSize.x != width && fScreenSize.y != height) { if (gRenderer == eRenderer::Dx9) { @@ -170,7 +172,7 @@ void Hook::ProcessFrame(void* ptr) { } if (gGameVer == eGameVer::SA) { - injector::MakeNOP(0x00531155, 5); // shift trigger fix + injector::MakeNOP(0x531155, 5); // shift trigger fix } if (gRenderer == eRenderer::Dx9) { diff --git a/src/opcodemgr.cpp b/src/opcodemgr.cpp index b9c2a5c..b23353a 100644 --- a/src/opcodemgr.cpp +++ b/src/opcodemgr.cpp @@ -43,33 +43,6 @@ static RTN_TYPE RUNTIME_API ImGuiEnd(RUNTIME_CONTEXT ctx) { return RTN_CONTINUE; } -// static RTN_TYPE RUNTIME_API ImGuiBegin(RUNTIME_CONTEXT ctx) { -// char label[RUNTIME_STR_LEN]; - -// wGetStringWithFrame(ctx, label, RUNTIME_STR_LEN); -// bool openFlag = wGetBoolParam(ctx); -// bool noTitleBar = wGetBoolParam(ctx); -// bool noResize = wGetBoolParam(ctx); -// bool noMove = wGetBoolParam(ctx); -// bool autoResize = wGetBoolParam(ctx); - -// ImGuiWindowFlags flags = ImGuiWindowFlags_NoCollapse; -// if (noTitleBar) flags |= ImGuiWindowFlags_NoTitleBar; -// if (noResize) flags |= ImGuiWindowFlags_NoResize; -// if (noMove) flags |= ImGuiWindowFlags_NoMove; -// if (autoResize) flags |= ImGuiWindowFlags_AlwaysAutoResize; - -// ScriptExData* data = ScriptExData::Get(); -// data->imgui += [=]() { -// bool isOpen = openFlag; -// ImGui::Begin(label, &isOpen, flags); -// data->SetData(label, 0, isOpen); -// }; -// data->imgui.lastScriptCall = time(NULL); -// wSetIntParam(ctx, data->GetData(label, 0, true)); -// return RTN_CONTINUE; -// } - static RTN_TYPE RUNTIME_API ImGuiButton(RUNTIME_CONTEXT ctx) { char buf[RUNTIME_STR_LEN]; ImVec2 size; @@ -314,14 +287,12 @@ static RTN_TYPE RUNTIME_API ImGuiGetFramerate(RUNTIME_CONTEXT ctx) { } static RTN_TYPE RUNTIME_API ImGuiGetVersion(RUNTIME_CONTEXT ctx) { - char* buf = const_cast(ImGui::GetVersion()); - unsigned char len = static_cast(strlen(buf)); - wSetStringParam(ctx, buf); + wSetIntParam(ctx, IMGUI_VERSION_NUM); return RTN_CONTINUE; } static RTN_TYPE RUNTIME_API ImGuiGetPluginVersion(RUNTIME_CONTEXT ctx) { - wSetFloatParam(ctx, IMGUI_REDUX_VERSION); + wSetIntParam(ctx, IMGUI_REDUX_VERSION_NUM); return RTN_CONTINUE; } @@ -551,8 +522,8 @@ static RTN_TYPE RUNTIME_API ImGuiGetDisplaySize(RUNTIME_CONTEXT ctx) { RECT rect; GetClientRect(GetForegroundWindow(), &rect); - wSetFloatParam(ctx, rect.right - rect.left); - wSetFloatParam(ctx, rect.bottom - rect.top); + wSetFloatParam(ctx, float(rect.right - rect.left)); + wSetFloatParam(ctx, float(rect.bottom - rect.top)); return RTN_CONTINUE; } diff --git a/src/pch.h b/src/pch.h index 9aa0f80..959c6e2 100644 --- a/src/pch.h +++ b/src/pch.h @@ -1,6 +1,7 @@ #pragma once #define _CRT_SECURE_NO_WARNINGS -#define IMGUI_REDUX_VERSION 2.0f +#define IMGUI_REDUX_VERSION 3.0f +#define IMGUI_REDUX_VERSION_NUM 30000 #include "imgui.h" #include "imgui_stdlib.h" #include "scriptextender.hpp" diff --git a/src/scriptextender.hpp b/src/scriptextender.hpp index eb93d7a..966f5ea 100644 --- a/src/scriptextender.hpp +++ b/src/scriptextender.hpp @@ -84,6 +84,8 @@ class ScriptExData case 2: // SA scriptsPaused = *(bool*)0xB7CB49; break; + default: + break; } if (curTime-lastScriptCall > 2 || scriptsPaused) { diff --git a/tools/Debug.bat b/tools/Debug.bat index 4e0aa7d..776705c 100644 --- a/tools/Debug.bat +++ b/tools/Debug.bat @@ -5,14 +5,7 @@ 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 14a650e..469d80d 100644 --- a/tools/Debug64.bat +++ b/tools/Debug64.bat @@ -5,14 +5,7 @@ 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 f4f2b80..c5c9cd5 100644 --- a/tools/DebugCleo.bat +++ b/tools/DebugCleo.bat @@ -5,14 +5,7 @@ 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 7f6298a..5c82e12 100644 --- a/tools/Release.bat +++ b/tools/Release.bat @@ -5,10 +5,5 @@ 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 d055848..a926dc2 100644 --- a/tools/Release64.bat +++ b/tools/Release64.bat @@ -5,10 +5,5 @@ 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 641d717..49cd68b 100644 --- a/tools/ReleaseCleo.bat +++ b/tools/ReleaseCleo.bat @@ -5,10 +5,5 @@ 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 db65436..f05d24e 100644 --- a/tools/Setup.bat +++ b/tools/Setup.bat @@ -1,5 +1,4 @@ @echo off -<<<<<<< HEAD set "projectdir=%CD%" set "PLUGIN_NAME="GrinchTrainer"" @@ -46,10 +45,3 @@ premake5.exe vs2022 :run_dev cd "%projectdir%\build" 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