diff --git a/src/defines.h b/src/defines.h index 1b279ce..756390c 100644 --- a/src/defines.h +++ b/src/defines.h @@ -9,7 +9,7 @@ #define MENU_NAME "Cheat Menu" #define MENU_VERSION_NUMBER "3.3" #define MENU_VERSION MENU_VERSION_NUMBER"-beta" -#define BUILD_NUMBER "20220620" +#define BUILD_NUMBER "20220626" #define MENU_TITLE MENU_NAME " v" MENU_VERSION #ifdef GTASA diff --git a/src/game.cpp b/src/game.cpp index 41a2374..12d1110 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -261,14 +261,14 @@ void Game::FreeCam() Command(true); patch::Set(0xBA676C, 2); // disable radar #elif GTAVC - m_Freecam::m_pPed->m_nFlags.bIsVisible = false; - m_Freecam::m_pPed->m_nFlags.bUseCollision = false; - m_Freecam::m_pPed->SetPosition(playerPos); + Freecam::m_pPed->m_nFlags.bIsVisible = false; + Freecam::m_pPed->m_nFlags.bUseCollision = false; + Freecam::m_pPed->SetPosition(playerPos); patch::Set(0xA10AB6, 1); // disable radar #else - m_Freecam::m_pPed->m_nFlags.bIsVisible = false; - m_Freecam::m_pPed->m_nFlags.bUsesCollision = false; - m_Freecam::m_pPed->SetPosition(playerPos.x, playerPos.y, playerPos.z); + Freecam::m_pPed->m_nFlags.bIsVisible = false; + Freecam::m_pPed->m_nFlags.bUsesCollision = false; + Freecam::m_pPed->SetPosition(playerPos.x, playerPos.y, playerPos.z); #endif Freecam::m_bInitDone = true; @@ -379,11 +379,11 @@ void Game::FreeCam() Freecam::m_pPed->SetPosn(pos); CIplStore::AddIplsNeededAtPosn(pos); #elif GTAVC - m_Freecam::m_pPed->m_placement.SetHeading(m_Freecam::m_fTotalMouse.x); - m_Freecam::m_pPed->SetPosition(pos); + Freecam::m_pPed->m_placement.SetHeading(Freecam::m_fTotalMouse.x); + Freecam::m_pPed->SetPosition(pos); #else - m_Freecam::m_pPed->SetHeading(m_Freecam::m_fTotalMouse.x); - m_Freecam::m_pPed->SetPosition(pos.x, pos.y, pos.z); + Freecam::m_pPed->SetHeading(Freecam::m_fTotalMouse.x); + Freecam::m_pPed->SetPosition(pos.x, pos.y, pos.z); #endif } @@ -516,7 +516,7 @@ void Game::ShowPage() HardMode::m_fBacMaxHealth = CStats::GetStatValue(STAT_MAX_HEALTH); HardMode::m_fBacStamina = CStats::GetStatValue(STAT_STAMINA); #else - m_HardMode::m_fBacMaxHealth = 100.0f; + HardMode::m_fBacMaxHealth = 100.0f; #endif player->m_fHealth = 50.0f; } @@ -781,7 +781,7 @@ void Game::ShowPage() #ifdef GTASA if (ImGui::BeginTabItem(TEXT("Game.Stats"))) { - // similar to Ui::DrawJSON() + // similar to Ui::DrawList() ImGui::Spacing(); if (ImGui::Button(TEXT("Game.MaxWepSkills"), Ui::GetSize(2))) diff --git a/src/ped.cpp b/src/ped.cpp index 961b9d1..0f82083 100644 --- a/src/ped.cpp +++ b/src/ped.cpp @@ -137,7 +137,7 @@ void Ped::SpawnPed(std::string& cat, std::string& name, std::string& model) Command(currentSlot, model.c_str()); Command(); - Command(m_SpawnPed::m_nSelectedPedType + 4, 108+currentSlot, pos.x, pos.y, pos.z + 1, &hplayer); + Command(SpawnPed::m_nSelectedPedType + 4, 108+currentSlot, pos.x, pos.y, pos.z + 1, &hplayer); Command(currentSlot); ++currentSlot; @@ -365,7 +365,7 @@ void Ped::ShowPage() return m_PedData.m_pData->Get(str.c_str(), "Unknown"); }); #else - Ui::DrawJSON(m_PedData, SpawnPed, nullptr); + Ui::DrawList(m_PedData, SpawnPed, nullptr); #endif ImGui::EndTabItem(); } @@ -416,11 +416,11 @@ void Ped::ShowPage() } ); #else - Ui::DrawJSON(Weapon::m_WeaponData, + Ui::DrawList(Weapon::m_WeaponData, [](std::string& root, std::string& key, std::string& id) { - m_SpawnPed::m_nWeaponId = std::stoi(id); - m_SpawnPed::m_nWeaponName = key; + SpawnPed::m_nWeaponId = std::stoi(id); + SpawnPed::m_nWeaponName = key; }, nullptr); #endif diff --git a/src/player.cpp b/src/player.cpp index f81594c..21e770d 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -891,7 +891,7 @@ void Player::ShowPage() #else ImGui::TextWrapped(TEXT("Player.WorkSkinOnly")); #endif - Ui::DrawJSON(skinData, ChangePlayerModel, nullptr); + Ui::DrawList(skinData, ChangePlayerModel, nullptr); ImGui::EndTabItem(); } #endif diff --git a/src/teleport.cpp b/src/teleport.cpp index 5ec1b22..3518942 100644 --- a/src/teleport.cpp +++ b/src/teleport.cpp @@ -40,30 +40,30 @@ void Teleport::Init() Events::processScriptsEvent += [] { - if ((QuicKTP::m_bEnabled == true) && ((CTimer::m_snTimeInMilliseconds - QuicKTP::m_nTimer) > 500)) + if ((QuickTP::m_bEnabled == true) && ((CTimer::m_snTimeInMilliseconds - QuickTP::m_nTimer) > 500)) { CPlayerPed* player = FindPlayerPed(); #ifdef GTASA CEntity* player_entity = FindPlayerEntity(-1); - QuicKTP::m_fPos.z = CWorld::FindGroundZFor3DCoord(QuicKTP::m_fPos.x, QuicKTP::m_fPos.y, - QuicKTP::m_fPos.z + 100.0f, nullptr, &player_entity) + 1.0f; + QuickTP::m_fPos.z = CWorld::FindGroundZFor3DCoord(QuickTP::m_fPos.x, QuickTP::m_fPos.y, + QuickTP::m_fPos.z + 100.0f, nullptr, &player_entity) + 1.0f; #else - m_Teleport::m_fPos.z = CWorld::FindGroundZFor3DCoord(m_Teleport::m_fPos.x, m_Teleport::m_fPos.y, - m_Teleport::m_fPos.z + 100.0f, nullptr) + 1.0f; + QuickTP::m_fPos.z = CWorld::FindGroundZFor3DCoord(QuickTP::m_fPos.x, QuickTP::m_fPos.y, + QuickTP::m_fPos.z + 100.0f, nullptr) + 1.0f; #endif CVehicle* pVeh = player->m_pVehicle; if (pVeh && BY_GAME(player->m_nPedFlags.bInVehicle, player->m_pVehicle, player->m_pVehicle)) { - BY_GAME(pVeh->Teleport(QuicKTP::m_fPos, false), pVeh->Teleport(QuicKTP::m_fPos), player->Teleport(QuicKTP::m_fPos)); + BY_GAME(pVeh->Teleport(QuickTP::m_fPos, false), pVeh->Teleport(QuickTP::m_fPos), player->Teleport(QuickTP::m_fPos)); } else { - BY_GAME(player->Teleport(QuicKTP::m_fPos, false), player->Teleport(QuicKTP::m_fPos), player->Teleport(QuicKTP::m_fPos)); + BY_GAME(player->Teleport(QuickTP::m_fPos, false), player->Teleport(QuickTP::m_fPos), player->Teleport(QuickTP::m_fPos)); } - QuicKTP::m_bEnabled = false; + QuickTP::m_bEnabled = false; Command(CPools::GetPedRef(player), false); Command(); TheCamera.Fade(0, 1); @@ -100,9 +100,9 @@ void Teleport::TeleportPlayer(bool get_marker, CVector pos, int interior_id) pos = targetBlip.m_vecPos; pos.z = CWorld::FindGroundZFor3DCoord(pos.x, pos.y, 1000, nullptr, &pPlayerEntity) + 500.f; - QuicKTP::m_fPos = pos; - QuicKTP::m_nTimer = CTimer::m_snTimeInMilliseconds; - QuicKTP::m_bEnabled = true; + QuickTP::m_fPos = pos; + QuickTP::m_nTimer = CTimer::m_snTimeInMilliseconds; + QuickTP::m_bEnabled = true; TheCamera.Fade(0, 0); Command(CPools::GetPedRef(pPlayer), true); } diff --git a/src/teleport.h b/src/teleport.h index 2d3d3b2..8dd7cd4 100644 --- a/src/teleport.h +++ b/src/teleport.h @@ -15,7 +15,7 @@ private: static inline DataStore m_SpriteData {"sprites"}; #endif - struct QuicKTP + struct QuickTP { static inline bool m_bEnabled; static inline CVector m_fPos = { -1, -1, -1 }; diff --git a/src/vehicle.cpp b/src/vehicle.cpp index ffb3d9f..2c38e39 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -1073,7 +1073,7 @@ void Vehicle::ShowPage() return GetNameFromModel(std::stoi(str)); }); #else - Ui::DrawJSON(m_Spawner::m_VehData, SpawnVehicle, nullptr); + Ui::DrawList(Spawner::m_VehData, SpawnVehicle, nullptr); #endif ImGui::EndTabItem(); } @@ -1118,9 +1118,9 @@ void Vehicle::ShowPage() ImGui::RadioButton(TEXT("Vehicle.Tertiary"), &PaintData::m_nRadioButton, 3); ImGui::RadioButton(TEXT("Vehicle.Quaternary"), &PaintData::m_nRadioButton, 4); #else - ImGui::RadioButton(TEXT("Vehicle.Primary"), &m_PaintData::m_nRadioButton, 1); + ImGui::RadioButton(TEXT("Vehicle.Primary"), &PaintData::m_nRadioButton, 1); ImGui::NextColumn(); - ImGui::RadioButton(TEXT("Vehicle.Secondary"), &m_PaintData::m_nRadioButton, 2); + ImGui::RadioButton(TEXT("Vehicle.Secondary"), &PaintData::m_nRadioButton, 2); #endif ImGui::Spacing(); ImGui::Columns(1); diff --git a/src/weapon.cpp b/src/weapon.cpp index 3f49e04..d683381 100644 --- a/src/weapon.cpp +++ b/src/weapon.cpp @@ -358,7 +358,7 @@ void Weapon::ShowPage() } ); #else - Ui::DrawJSON(m_WeaponData, GiveWeaponToPlayer, nullptr); + Ui::DrawList(m_WeaponData, GiveWeaponToPlayer, nullptr); #endif ImGui::EndTabItem(); }