diff --git a/resource/common/locale/English.toml b/resource/common/locale/English.toml index bc855fd..645ffef 100644 --- a/resource/common/locale/English.toml +++ b/resource/common/locale/English.toml @@ -296,6 +296,7 @@ RemovePeds = "Remove peds" RemovePedsRadius = "Remove peds in radius" ResetModels = "Reset models" SelectedWeapon = "Selected weapon: %s" +SelectMember = "Select member" SelectWeapon = "Select weapon" SlutMagnet = "Slut magnet" SpawnerTab = "Spawner" @@ -786,7 +787,6 @@ MoveWhenFiring = "Move when firing" NoSpread = "No spread" RapidFire = "Rapid fire" SelectGang = "Select gang" -SelectMember = "Select member" Weapon1 = "Weapon 1" Weapon2 = "Weapon 2" Weapon3 = "Weapon 3" diff --git a/src/defines.h b/src/defines.h index 21d9340..4005d02 100644 --- a/src/defines.h +++ b/src/defines.h @@ -10,7 +10,7 @@ #define MENU_NAME "Cheat Menu" #define MENU_VERSION_NUMBER "3.3" #define MENU_VERSION MENU_VERSION_NUMBER"-beta" -#define BUILD_NUMBER "20220821" +#define BUILD_NUMBER "20220825" #define MENU_TITLE MENU_NAME " v" MENU_VERSION #ifdef GTASA diff --git a/src/pages/vehicle.cpp b/src/pages/vehicle.cpp index e381094..49fa0b0 100644 --- a/src/pages/vehicle.cpp +++ b/src/pages/vehicle.cpp @@ -337,7 +337,9 @@ void VehiclePage::SpawnVehicle(std::string& rootkey, std::string& vehName, std:: veh = (CVehicle*)train; hveh = CPools::GetVehicleRef(veh); if (veh->m_pDriver) + { Command(CPools::GetPedRef(veh->m_pDriver)); + } if (m_Spawner.m_bAsDriver) { diff --git a/src/utils/d3dhook.cpp b/src/utils/d3dhook.cpp index a2efdaf..2047b23 100644 --- a/src/utils/d3dhook.cpp +++ b/src/utils/d3dhook.cpp @@ -5,7 +5,6 @@ #include "imgui/imgui_impl_dx9.h" #include "imgui/imgui_impl_dx11.h" #include "imgui/imgui_impl_win32.h" -#include extern IMGUI_IMPL_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); @@ -228,7 +227,7 @@ void D3dHook::ProcessMouse() patch::Nop(BY_GAME(0x541DD7, 0x4AB6CA, 0x49272F), 5); // don't call CPad::UpdateMouse() #ifdef GTASA // Fix bug with radio switching - patch::SetUInt(0x4EB731, 0xEB); // jz -> jmp, skip mouse checks + patch::SetUChar(0x4EB731, 0xEB); // jz -> jmp, skip mouse checks patch::SetUChar(0x4EB75A, 0xEB); // jz -> jmp, skip mouse checks #endif }