From 03576f4d7451dfb4ed65a259a841293ccf58e68f Mon Sep 17 00:00:00 2001
From: Maddy <59680197+xM4ddy@users.noreply.github.com>
Date: Wed, 2 Mar 2022 19:35:20 -0500
Subject: [PATCH] Session Changer move from Self tab to Session tab (#76)

---
 BigBaseV2/src/backend/backend.cpp    |  6 ++---
 BigBaseV2/src/views/view.hpp         | 35 +++++++++++++++-------------
 BigBaseV2/src/views/view_self.cpp    | 15 +-----------
 BigBaseV2/src/views/view_session.cpp | 21 +++++++++++++++++
 4 files changed, 44 insertions(+), 33 deletions(-)
 create mode 100644 BigBaseV2/src/views/view_session.cpp

diff --git a/BigBaseV2/src/backend/backend.cpp b/BigBaseV2/src/backend/backend.cpp
index e8a0bab9..c74e4717 100644
--- a/BigBaseV2/src/backend/backend.cpp
+++ b/BigBaseV2/src/backend/backend.cpp
@@ -61,13 +61,13 @@ namespace big
 			looped::weapons_delete_gun();
 			looped::weapons_force_crosshairs();
 			looped::weapons_gravity_gun();
-			looped::weapons_infinite_ammo();
 			looped::weapons_increased_damage();
+			looped::weapons_infinite_ammo();
 			looped::weapons_infinite_mag();
-			looped::weapons_no_spread();
 			looped::weapons_no_recoil();
-			looped::weapons_steal_vehicle_gun();
+			looped::weapons_no_spread();
 			looped::weapons_repair_gun();
+			looped::weapons_steal_vehicle_gun();
 			looped::weapons_vehicle_gun();
 		}QUEUE_JOB_END_CLAUSE
 
diff --git a/BigBaseV2/src/views/view.hpp b/BigBaseV2/src/views/view.hpp
index 134da1fd..a8bd6be3 100644
--- a/BigBaseV2/src/views/view.hpp
+++ b/BigBaseV2/src/views/view.hpp
@@ -9,17 +9,18 @@ namespace big
 	class view
 	{
 		enum class tabs {
-			NONE,
-			SELF,
+			DEBUG,
 			MOBILE,
-			SPAWN,
-			WEAPONS,
-			SPOOFING,
+			NONE,
+			PLAYER,
+			SELF,
+			SESSION,
 			SETTINGS,
+			SPAWN,
+			SPOOFING,
 			TELEPORT,
 			VEHICLE,
-			PLAYER,
-			DEBUG,
+			WEAPONS,
 		};
 
 		struct navigation_struct
@@ -29,19 +30,20 @@ namespace big
 			std::function<void()> func = nullptr;
 		};
 
-		static void self();
-		static void vehicle();
+		static void active_view();
 		static void debug();
-		static void view_player();
-		static void weapons();
 		static void mobile();
-		static void teleport();
-		static void spawn();
-		static void settings();
-		static void spoofing();
 		static void navigation();
 		static void notifications();
-		static void active_view();
+		static void self();
+		static void session();
+		static void settings();
+		static void spawn();
+		static void spoofing();
+		static void teleport();
+		static void vehicle();
+		static void view_player();
+		static void weapons();
 
 		inline static animator window_animator = animator();
 
@@ -57,6 +59,7 @@ namespace big
 			{ tabs::VEHICLE, "Vehicle", view::vehicle },
 			{ tabs::WEAPONS, "Weapons", view::weapons },
 			{ tabs::SPOOFING, "Spoofing", view::spoofing },
+			{ tabs::SESSION, "Session", view::session },
 			{ tabs::SETTINGS, "Settings", view::settings },
 			{ tabs::DEBUG, "Debug", view::debug },
 			{ tabs::PLAYER, "Players", view::view_player },
diff --git a/BigBaseV2/src/views/view_self.cpp b/BigBaseV2/src/views/view_self.cpp
index 3ddaee4b..5eea61f5 100644
--- a/BigBaseV2/src/views/view_self.cpp
+++ b/BigBaseV2/src/views/view_self.cpp
@@ -1,10 +1,6 @@
-#include "views/view.hpp"
 #include "fiber_pool.hpp"
-#include "script.hpp"
-#include "script_global.hpp"
 #include "util/entity.hpp"
-#include "util/player.hpp"
-#include "util/session.hpp"
+#include "views/view.hpp"
 
 namespace big
 {
@@ -128,15 +124,6 @@ namespace big
 			components::button("Skip Cutscene", [] {
 				CUTSCENE::STOP_CUTSCENE_IMMEDIATELY();
 				});
-
-			ImGui::Text("Session");
-			for (const SessionType& session_type : sessions)
-			{
-				components::button(session_type.name, [session_type] {
-					session::join_type(session_type);
-					});
-			}
-
 		}
 	}
 }
\ No newline at end of file
diff --git a/BigBaseV2/src/views/view_session.cpp b/BigBaseV2/src/views/view_session.cpp
new file mode 100644
index 00000000..fcf16760
--- /dev/null
+++ b/BigBaseV2/src/views/view_session.cpp
@@ -0,0 +1,21 @@
+#include "util/session.hpp"
+#include "views/view.hpp"
+
+namespace big
+{
+	void view::session() {
+
+		if (ImGui::TreeNode("Session Switcher"))
+		{
+			for (const SessionType& session_type : sessions)
+			{
+				components::button(session_type.name, [session_type] {
+					session::join_type(session_type);
+					});
+			}
+
+			ImGui::TreePop();
+
+		}
+	}
+}
\ No newline at end of file