diff --git a/resource/common/locale/English.toml b/resource/common/locale/English.toml index a2488c9..dccb26b 100644 --- a/resource/common/locale/English.toml +++ b/resource/common/locale/English.toml @@ -228,7 +228,7 @@ Right click disables hotkey.""" VehEngineKey = "Toggle vehicle engine" VehHealth = "Veh Health: %.f" VehicleSpawned = "Vehicle spawned" -VehSpeed = "Veh Health: %d" +VehSpeed = "Veh Speed: %d" VehStartKey = "Vehicle instant start" VehStopKey = "Vehicle instant start" Version = "Version" diff --git a/src/dllmain.cpp b/src/dllmain.cpp index fd5896f..cd910b1 100644 --- a/src/dllmain.cpp +++ b/src/dllmain.cpp @@ -70,7 +70,7 @@ void MenuThread(void* param) } #endif - Log::Print("Version: " MENU_TITLE "\nAuthor: Grinch_\nDiscord: " DISCORD_INVITE "\nMore Info: " GITHUB_LINK "\n"); + Log::Print("Stating " MENU_TITLE "\nAuthor: Grinch_\nDiscord: " DISCORD_INVITE "\nMore Info: " GITHUB_LINK "\n"); CheatMenu::Init(); diff --git a/src/weapon.cpp b/src/weapon.cpp index bce07f4..3f49e04 100644 --- a/src/weapon.cpp +++ b/src/weapon.cpp @@ -372,7 +372,7 @@ void Weapon::ShowPage() ImGui::Spacing(); std::string key = std::to_string(m_nGangWeaponList[m_nSelectedGang][m_nSelectedWeapon]); - ImGui::Text(TEXT("Weapon.CurrentWeapon"), m_WeaponData.m_pData->Get(key.c_str(), "Unknown")); + ImGui::Text(TEXT("Weapon.CurrentWeapon"), m_WeaponData.m_pData->Get(key.c_str(), "Unknown").c_str()); ImGui::Spacing(); Ui::DrawImages(m_WeaponData, SetGangWeapon, nullptr, [](std::string str) diff --git a/tools/DebugAll.bat b/tools/DebugAll.bat index 6a7ee05..9dbad03 100644 --- a/tools/DebugAll.bat +++ b/tools/DebugAll.bat @@ -11,9 +11,9 @@ del %VC_DIR%"\CheatMenuVC.asi" /Q del %VC_DIR%"\CheatMenuVC.pdb" /Q del %III_DIR%"\CheatMenuIII.asi" /Q del %III_DIR%"\CheatMenuIII.pdb" /Q -%systemroot%\System32\xcopy /s "bin\CheatMenuSA.asi" %SA_DIR% /K /D /H /Y -%systemroot%\System32\xcopy /s "bin\CheatMenuVC.asi" %VC_DIR% /K /D /H /Y -%systemroot%\System32\xcopy /s "bin\CheatMenuIII.asi" %III_DIR% /K /D /H /Y -%systemroot%\System32\xcopy /s "bin\CheatMenuSA.pdb" %SA_DIR% /K /D /H /Y -%systemroot%\System32\xcopy /s "bin\CheatMenuVC.pdb" %VC_DIR% /K /D /H /Y -%systemroot%\System32\xcopy /s "bin\CheatMenuIII.pdb" %III_DIR% /K /D /H /Y \ No newline at end of file +xcopy /s "bin\CheatMenuSA.asi" %SA_DIR% /K /D /H /Y +xcopy /s "bin\CheatMenuVC.asi" %VC_DIR% /K /D /H /Y +xcopy /s "bin\CheatMenuIII.asi" %III_DIR% /K /D /H /Y +xcopy /s "bin\CheatMenuSA.pdb" %SA_DIR% /K /D /H /Y +xcopy /s "bin\CheatMenuVC.pdb" %VC_DIR% /K /D /H /Y +xcopy /s "bin\CheatMenuIII.pdb" %III_DIR% /K /D /H /Y \ No newline at end of file diff --git a/tools/DebugIII.bat b/tools/DebugIII.bat index 0e3d4b8..a4fc6a9 100644 --- a/tools/DebugIII.bat +++ b/tools/DebugIII.bat @@ -7,5 +7,5 @@ call "tools\Setup.bat" MsBuild CheatMenu.sln /property:Configuration=Debug /t:CheatMenuIII del %III_DIR%"\CheatMenuIII.asi" /Q del %III_DIR%"\CheatMenuIII.pdb" /Q -%systemroot%\System32\xcopy /s "bin\CheatMenuIII.asi" %III_DIR% /K /D /H /Y -%systemroot%\System32\xcopy /s "bin\CheatMenuIII.pdb" %III_DIR% /K /D /H /Y +xcopy /s "bin\CheatMenuIII.asi" %III_DIR% /K /D /H /Y +xcopy /s "bin\CheatMenuIII.pdb" %III_DIR% /K /D /H /Y diff --git a/tools/DebugSA.bat b/tools/DebugSA.bat index aaa665e..2acda55 100644 --- a/tools/DebugSA.bat +++ b/tools/DebugSA.bat @@ -7,5 +7,5 @@ call "tools\Setup.bat" MsBuild CheatMenu.sln /property:Configuration=Debug /t:CheatMenuSA del %SA_DIR%"\CheatMenuSA.asi" /Q del %SA_DIR%"\CheatMenuSA.pdb" /Q -%systemroot%\System32\xcopy /s "bin\CheatMenuSA.asi" %SA_DIR% /K /D /H /Y -%systemroot%\System32\xcopy /s "bin\CheatMenuSA.pdb" %SA_DIR% /K /D /H /Y +xcopy /s "bin\CheatMenuSA.asi" %SA_DIR% /K /D /H /Y +xcopy /s "bin\CheatMenuSA.pdb" %SA_DIR% /K /D /H /Y diff --git a/tools/DebugVC.bat b/tools/DebugVC.bat index d7ae609..7639350 100644 --- a/tools/DebugVC.bat +++ b/tools/DebugVC.bat @@ -7,5 +7,5 @@ call "tools\Setup.bat" MsBuild CheatMenu.sln /property:Configuration=Debug /t:CheatMenuVC del %VC_DIR%"\CheatMenuVC.asi" /Q del %VC_DIR%"\CheatMenuVC.pdb" /Q -%systemroot%\System32\xcopy /s "bin\CheatMenuVC.asi" %VC_DIR% /K /D /H /Y -%systemroot%\System32\xcopy /s "bin\CheatMenuVC.pdb" %VC_DIR% /K /D /H /Y +xcopy /s "bin\CheatMenuVC.asi" %VC_DIR% /K /D /H /Y +xcopy /s "bin\CheatMenuVC.pdb" %VC_DIR% /K /D /H /Y diff --git a/tools/PackAll.bat b/tools/PackAll.bat index b1d6836..87e8df3 100644 --- a/tools/PackAll.bat +++ b/tools/PackAll.bat @@ -39,6 +39,6 @@ xcopy /s %folderpath% "pack\%~1\" /K /D /H /Y xcopy /s "..\resource\common\" "pack\%~1\" /K /D /H /Y @REM Guessing we have 7zip installed already, well I have -"C:\Program Files\7-Zip\7z.exe" a -t7z %archivePath% ".\pack\*" -mx=9 -v7M +"C:\Program Files\7-Zip\7z.exe" a -t7z %archivePath% ".\pack\*" -mx=9 @REM ------------------------------------------------------ diff --git a/tools/ReleaseAll.bat b/tools/ReleaseAll.bat index 41e54c5..521ebec 100644 --- a/tools/ReleaseAll.bat +++ b/tools/ReleaseAll.bat @@ -8,6 +8,6 @@ MsBuild CheatMenu.sln /property:Configuration=Release del %SA_DIR%"\CheatMenuSA.asi" /Q del %VC_DIR%"\CheatMenuVC.asi" /Q del %III_DIR%"\CheatMenuIII.asi" /Q -%systemroot%\System32\xcopy /s "bin\CheatMenuSA.asi" %SA_DIR% /K /D /H /Y -%systemroot%\System32\xcopy /s "bin\CheatMenuVC.asi" %VC_DIR% /K /D /H /Y -%systemroot%\System32\xcopy /s "bin\CheatMenuIII.asi" %III_DIR% /K /D /H /Y \ No newline at end of file +xcopy /s "bin\CheatMenuSA.asi" %SA_DIR% /K /D /H /Y +xcopy /s "bin\CheatMenuVC.asi" %VC_DIR% /K /D /H /Y +xcopy /s "bin\CheatMenuIII.asi" %III_DIR% /K /D /H /Y \ No newline at end of file diff --git a/tools/ReleaseIII.bat b/tools/ReleaseIII.bat index 1dc143b..5e5054e 100644 --- a/tools/ReleaseIII.bat +++ b/tools/ReleaseIII.bat @@ -6,4 +6,4 @@ echo[ call "tools\Setup.bat" MsBuild CheatMenu.sln /property:Configuration=Release /t:CheatMenuIII del %III_DIR%"\CheatMenuIII.asi" /Q -%systemroot%\System32\xcopy /s "bin\CheatMenuIII.asi" %III_DIR% /K /D /H /Y +xcopy /s "bin\CheatMenuIII.asi" %III_DIR% /K /D /H /Y diff --git a/tools/ReleaseSA.bat b/tools/ReleaseSA.bat index 0804bfc..a3ea188 100644 --- a/tools/ReleaseSA.bat +++ b/tools/ReleaseSA.bat @@ -6,4 +6,4 @@ echo[ call "tools\Setup.bat" MsBuild CheatMenu.sln /property:Configuration=Release /t:CheatMenuSA del %SA_DIR%"\CheatMenuSA.asi" /Q -%systemroot%\System32\xcopy /s "bin\CheatMenuSA.asi" %SA_DIR% /K /D /H /Y +xcopy /s "bin\CheatMenuSA.asi" %SA_DIR% /K /D /H /Y diff --git a/tools/ReleaseVC.bat b/tools/ReleaseVC.bat index 902306e..15955dd 100644 --- a/tools/ReleaseVC.bat +++ b/tools/ReleaseVC.bat @@ -6,4 +6,4 @@ echo[ call "tools\Setup.bat" MsBuild CheatMenu.sln /property:Configuration=Release /t:CheatMenuVC del %VC_DIR%"\CheatMenuVC.asi" /Q -%systemroot%\System32\xcopy /s "bin\CheatMenuVC.asi" %VC_DIR% /K /D /H /Y +xcopy /s "bin\CheatMenuVC.asi" %VC_DIR% /K /D /H /Y