From 761227344d78986a2435473d0c1f84cabb16e850 Mon Sep 17 00:00:00 2001 From: Yimura Date: Sat, 16 Jan 2021 13:19:20 +0100 Subject: [PATCH] refactor(TabBar): Renamed all files --- BigBaseV2/src/gui/tab_bar.hpp | 2 ++ .../gui/tab_bar/{tab_misc.cpp => main/misc.cpp} | 0 .../tab_bar/{tab_online.cpp => main/online.cpp} | 0 .../gui/tab_bar/{tab_self.cpp => main/self.cpp} | 0 .../{tab_settings.cpp => main/settings.cpp} | 8 +++++--- .../tab_bar/{tab_spawn.cpp => main/spawn.cpp} | 2 +- .../{tab_teleport.cpp => main/teleport.cpp} | 0 .../{tab_tunables.cpp => main/tunables.cpp} | 0 .../{tab_vehicle.cpp => main/vehicle.cpp} | 0 .../{tab_weapons.cpp => main/weapons.cpp} | 2 +- .../tab_bar/{tab_world.cpp => main/world.cpp} | 2 +- BigBaseV2/src/gui/windows/main.cpp | 4 ++-- BigBaseV2/src/gui/windows/player.cpp | 17 ++++++++++------- BigBaseV2/src/gui/windows/top_bar.cpp | 2 +- BigBaseV2/src/gui/windows/user_sidebar.cpp | 2 +- 15 files changed, 24 insertions(+), 17 deletions(-) rename BigBaseV2/src/gui/tab_bar/{tab_misc.cpp => main/misc.cpp} (100%) rename BigBaseV2/src/gui/tab_bar/{tab_online.cpp => main/online.cpp} (100%) rename BigBaseV2/src/gui/tab_bar/{tab_self.cpp => main/self.cpp} (100%) rename BigBaseV2/src/gui/tab_bar/{tab_settings.cpp => main/settings.cpp} (93%) rename BigBaseV2/src/gui/tab_bar/{tab_spawn.cpp => main/spawn.cpp} (95%) rename BigBaseV2/src/gui/tab_bar/{tab_teleport.cpp => main/teleport.cpp} (100%) rename BigBaseV2/src/gui/tab_bar/{tab_tunables.cpp => main/tunables.cpp} (100%) rename BigBaseV2/src/gui/tab_bar/{tab_vehicle.cpp => main/vehicle.cpp} (100%) rename BigBaseV2/src/gui/tab_bar/{tab_weapons.cpp => main/weapons.cpp} (99%) rename BigBaseV2/src/gui/tab_bar/{tab_world.cpp => main/world.cpp} (95%) diff --git a/BigBaseV2/src/gui/tab_bar.hpp b/BigBaseV2/src/gui/tab_bar.hpp index c23a733a..f7ebb75c 100644 --- a/BigBaseV2/src/gui/tab_bar.hpp +++ b/BigBaseV2/src/gui/tab_bar.hpp @@ -23,6 +23,8 @@ namespace big static void render_misc(); static void render_spawn(); static void render_settings(); + + static void player_info(); }; } \ No newline at end of file diff --git a/BigBaseV2/src/gui/tab_bar/tab_misc.cpp b/BigBaseV2/src/gui/tab_bar/main/misc.cpp similarity index 100% rename from BigBaseV2/src/gui/tab_bar/tab_misc.cpp rename to BigBaseV2/src/gui/tab_bar/main/misc.cpp diff --git a/BigBaseV2/src/gui/tab_bar/tab_online.cpp b/BigBaseV2/src/gui/tab_bar/main/online.cpp similarity index 100% rename from BigBaseV2/src/gui/tab_bar/tab_online.cpp rename to BigBaseV2/src/gui/tab_bar/main/online.cpp diff --git a/BigBaseV2/src/gui/tab_bar/tab_self.cpp b/BigBaseV2/src/gui/tab_bar/main/self.cpp similarity index 100% rename from BigBaseV2/src/gui/tab_bar/tab_self.cpp rename to BigBaseV2/src/gui/tab_bar/main/self.cpp diff --git a/BigBaseV2/src/gui/tab_bar/tab_settings.cpp b/BigBaseV2/src/gui/tab_bar/main/settings.cpp similarity index 93% rename from BigBaseV2/src/gui/tab_bar/tab_settings.cpp rename to BigBaseV2/src/gui/tab_bar/main/settings.cpp index 44714c7b..ef7169c3 100644 --- a/BigBaseV2/src/gui/tab_bar/tab_settings.cpp +++ b/BigBaseV2/src/gui/tab_bar/main/settings.cpp @@ -58,7 +58,7 @@ namespace big if (ImGui::Button("Send Event")) { - QUEUE_JOB_BEGIN_CLAUSE(=) + QUEUE_JOB_BEGIN_CLAUSE(= ) { int64_t* event_args = new int64_t[arg_count]; @@ -81,7 +81,7 @@ namespace big if (ImGui::TreeNode("Protections")) { - auto &protections = g_settings.options["settings"]["protections"]; + auto& protections = g_settings.options["settings"]["protections"]; if ( ImGui::Checkbox("Bounty", protections["bounty"].get()) || @@ -103,7 +103,9 @@ namespace big ImGui::Checkbox("Force Teleport", protections["force_teleport"].get()) || ImGui::Checkbox("Transaction Error", protections["transaction_error"].get()) || ImGui::Checkbox("Vehicle Kick", protections["vehicle_kick"].get()) - ) { g_settings.save(); } + ) { + g_settings.save(); + } if (ImGui::Button("Enable All")) features::functions::toggle_protections(true); diff --git a/BigBaseV2/src/gui/tab_bar/tab_spawn.cpp b/BigBaseV2/src/gui/tab_bar/main/spawn.cpp similarity index 95% rename from BigBaseV2/src/gui/tab_bar/tab_spawn.cpp rename to BigBaseV2/src/gui/tab_bar/main/spawn.cpp index a47fd38b..98bfaa31 100644 --- a/BigBaseV2/src/gui/tab_bar/tab_spawn.cpp +++ b/BigBaseV2/src/gui/tab_bar/main/spawn.cpp @@ -12,7 +12,7 @@ namespace big if ( ImGui::InputText("Model Name", model, sizeof(model), ImGuiInputTextFlags_EnterReturnsTrue) || ImGui::Button("Spawn") - ) + ) { QUEUE_JOB_BEGIN_CLAUSE(= ) { diff --git a/BigBaseV2/src/gui/tab_bar/tab_teleport.cpp b/BigBaseV2/src/gui/tab_bar/main/teleport.cpp similarity index 100% rename from BigBaseV2/src/gui/tab_bar/tab_teleport.cpp rename to BigBaseV2/src/gui/tab_bar/main/teleport.cpp diff --git a/BigBaseV2/src/gui/tab_bar/tab_tunables.cpp b/BigBaseV2/src/gui/tab_bar/main/tunables.cpp similarity index 100% rename from BigBaseV2/src/gui/tab_bar/tab_tunables.cpp rename to BigBaseV2/src/gui/tab_bar/main/tunables.cpp diff --git a/BigBaseV2/src/gui/tab_bar/tab_vehicle.cpp b/BigBaseV2/src/gui/tab_bar/main/vehicle.cpp similarity index 100% rename from BigBaseV2/src/gui/tab_bar/tab_vehicle.cpp rename to BigBaseV2/src/gui/tab_bar/main/vehicle.cpp diff --git a/BigBaseV2/src/gui/tab_bar/tab_weapons.cpp b/BigBaseV2/src/gui/tab_bar/main/weapons.cpp similarity index 99% rename from BigBaseV2/src/gui/tab_bar/tab_weapons.cpp rename to BigBaseV2/src/gui/tab_bar/main/weapons.cpp index a0cff84a..5087ff68 100644 --- a/BigBaseV2/src/gui/tab_bar/tab_weapons.cpp +++ b/BigBaseV2/src/gui/tab_bar/main/weapons.cpp @@ -45,7 +45,7 @@ namespace big case 4: ImGui::Text("Set the vehicle model to spawn."); - + break; } diff --git a/BigBaseV2/src/gui/tab_bar/tab_world.cpp b/BigBaseV2/src/gui/tab_bar/main/world.cpp similarity index 95% rename from BigBaseV2/src/gui/tab_bar/tab_world.cpp rename to BigBaseV2/src/gui/tab_bar/main/world.cpp index 81732584..7dd6f017 100644 --- a/BigBaseV2/src/gui/tab_bar/tab_world.cpp +++ b/BigBaseV2/src/gui/tab_bar/main/world.cpp @@ -33,7 +33,7 @@ namespace big } if (ImGui::Button("Set Weather")) { - QUEUE_JOB_BEGIN_CLAUSE(=) + QUEUE_JOB_BEGIN_CLAUSE(= ) { MISC::SET_OVERRIDE_WEATHER(weather_types[g_temp.weather_type]); MISC::SET_WEATHER_TYPE_NOW_PERSIST(weather_types[g_temp.weather_type]); diff --git a/BigBaseV2/src/gui/windows/main.cpp b/BigBaseV2/src/gui/windows/main.cpp index d730e604..6a8125f8 100644 --- a/BigBaseV2/src/gui/windows/main.cpp +++ b/BigBaseV2/src/gui/windows/main.cpp @@ -1,5 +1,5 @@ -#include "window.hpp" -#include "tab_bar/tab_bar.hpp" +#include "gui/window.hpp" +#include "gui/tab_bar.hpp" namespace big { diff --git a/BigBaseV2/src/gui/windows/player.cpp b/BigBaseV2/src/gui/windows/player.cpp index c9653c6c..8ee2e437 100644 --- a/BigBaseV2/src/gui/windows/player.cpp +++ b/BigBaseV2/src/gui/windows/player.cpp @@ -1,4 +1,5 @@ -#include "window.hpp" +#include "gui/window.hpp" +#include "gui/tab_bar.hpp" #include "features.hpp" #include "pointers.hpp" @@ -8,19 +9,21 @@ namespace big { if (g_selectedPlayer.id != g_selectedPlayerId || !g_selectedPlayer.is_online) return; - if (ImGui::Begin("Player Options")) + char title[64]; + strcpy(title, "Player Options: "); + strcat(title, g_selectedPlayer.name); + if (ImGui::Begin(title)) { - ImGui::Text("Selected player:"); - ImGui::SameLine(); ImGui::TextColored({ 25,180,38,255 }, g_selectedPlayer.name); - if (ImGui::Button("Close")) { g_selectedPlayerId = -2; } - ImGui::Separator(); + ImGui::BeginTabBar("tabbar_player"); - ImGui::Checkbox("Spectate Player", &g_temp.spectate_player); + ImGui::EndTabBar(); + + ImGui::Separator(); ImGui::Separator(); diff --git a/BigBaseV2/src/gui/windows/top_bar.cpp b/BigBaseV2/src/gui/windows/top_bar.cpp index bfaaaa7f..c37248a2 100644 --- a/BigBaseV2/src/gui/windows/top_bar.cpp +++ b/BigBaseV2/src/gui/windows/top_bar.cpp @@ -1,4 +1,4 @@ -#include "window.hpp" +#include "gui/window.hpp" #include "features.hpp" #include "natives.hpp" #include "script.hpp" diff --git a/BigBaseV2/src/gui/windows/user_sidebar.cpp b/BigBaseV2/src/gui/windows/user_sidebar.cpp index fa2c31f0..05160fa7 100644 --- a/BigBaseV2/src/gui/windows/user_sidebar.cpp +++ b/BigBaseV2/src/gui/windows/user_sidebar.cpp @@ -1,4 +1,4 @@ -#include "window.hpp" +#include "gui/window.hpp" #include "features.hpp" namespace big