diff --git a/src/Player.cpp b/src/Player.cpp index 221ed3a..7aef9cb 100644 --- a/src/Player.cpp +++ b/src/Player.cpp @@ -409,6 +409,7 @@ void Player::Draw() { pPlayer->m_nPedFlags.bDontRender = (pPlayer->m_nPedFlags.bDontRender == 1) ? 0 : 1; } + Ui::CheckboxAddress("Infinite sprint", 0xB7CEE4); #elif GTAVC Ui::CheckboxAddress("Infinite sprint", (int)&pInfo->m_bNeverGetsTired); #endif @@ -416,11 +417,11 @@ void Player::Draw() ImGui::NextColumn(); #ifdef GTASA - Ui::CheckboxAddress("Infinite sprint", 0xB7CEE4); if (Ui::CheckboxBitFlag("Lock control", pad->bPlayerSafe)) { pad->bPlayerSafe = (pad->bPlayerSafe == 1) ? 0 : 1; } + Ui::CheckboxAddressEx("Max sex appeal", 0x969180, 1, 0); Ui::CheckboxAddress("Mega jump", 0x96916C); Ui::CheckboxAddress("Mega punch", 0x969173); Ui::CheckboxAddress("Never get hungry", 0x969174); diff --git a/src/Teleport.cpp b/src/Teleport.cpp index 73cab19..76f782c 100644 --- a/src/Teleport.cpp +++ b/src/Teleport.cpp @@ -19,7 +19,7 @@ void Teleport::FetchRadarSpriteData() return; } - tp_data.m_pJson->m_Data.erase("Radar"); + m_tpData.m_pJson->m_Data.erase("Radar"); // 175 is the max number of sprites, FLA can increase this limit, might need to update this for (int i = 0; i != 175; ++i) @@ -29,7 +29,7 @@ void Teleport::FetchRadarSpriteData() auto sprite_name = m_SpriteJson.m_Data[std::to_string(sprite)].get(); std::string key_name = sprite_name + ", " + Util::GetLocationName(&pos); - tp_data.m_pJson->m_Data["Radar"][key_name] = "0, " + std::to_string(pos.x) + ", " + std::to_string(pos.y) + ", " + + m_tpData.m_pJson->m_Data["Radar"][key_name] = "0, " + std::to_string(pos.x) + ", " + std::to_string(pos.y) + ", " + std::to_string(pos.z); /* @@ -170,9 +170,9 @@ void Teleport::RemoveTeleportEntry(std::string& category, std::string& key, std: { if (category == "Custom") { - tp_data.m_pJson->m_Data["Custom"].erase(key); + m_tpData.m_pJson->m_Data["Custom"].erase(key); SetHelpMessage("Location removed", false, false, false); - tp_data.m_pJson->WriteToDisk(); + m_tpData.m_pJson->WriteToDisk(); } else { @@ -256,7 +256,7 @@ void Teleport::Draw() #endif ImGui::Spacing(); - Ui::DrawJSON(tp_data, TeleportToLocation,RemoveTeleportEntry); + Ui::DrawJSON(m_tpData, TeleportToLocation,RemoveTeleportEntry); ImGui::EndTabItem(); } @@ -268,15 +268,15 @@ void Teleport::Draw() ImGui::Spacing(); if (ImGui::Button("Add location", Ui::GetSize())) { - tp_data.m_pJson->m_Data["Custom"][m_nLocationBuffer] = ("0, " + std::string(m_nInputBuffer)); + m_tpData.m_pJson->m_Data["Custom"][m_nLocationBuffer] = ("0, " + std::string(m_nInputBuffer)); #ifdef GTASA // Clear the Radar coordinates - tp_data.m_pJson->m_Data.erase("Radar"); - tp_data.m_pJson->m_Data["Radar"] = {}; + m_tpData.m_pJson->m_Data.erase("Radar"); + m_tpData.m_pJson->m_Data["Radar"] = {}; #endif - tp_data.m_pJson->WriteToDisk(); + m_tpData.m_pJson->WriteToDisk(); } ImGui::EndTabItem(); } diff --git a/src/Teleport.h b/src/Teleport.h index 00edbe4..9a6bb7a 100644 --- a/src/Teleport.h +++ b/src/Teleport.h @@ -8,7 +8,7 @@ private: inline static bool m_bInsertCoord; inline static bool m_bQuickTeleport; inline static char m_nInputBuffer[INPUT_BUFFER_SIZE]; - inline static ResourceStore tp_data{ "teleport", eResourceType::TYPE_TEXT }; + inline static ResourceStore m_tpData{ "teleport", eResourceType::TYPE_TEXT }; inline static char m_nLocationBuffer[INPUT_BUFFER_SIZE]; inline static uint m_nQuickTeleportTimer;