refractor savedvehicles & vehicle spawn (#604)

- add checkbox in savedvehicles to spawninside
- use shared logic to get spawn location for a given vehicle model for saved veh, cloned pv veh & spawned veh

src/game/backend/SavedVehicles.cpp

@@ -145,10 +145,10 @@ namespace YimMenu
 		});
 	}
 
-	void SavedVehicles::Load(std::string folderName, std::string fileName)
+	void SavedVehicles::Load(std::string folderName, std::string fileName, bool spawnInside)
 	{
 		if (!fileName.empty())
-			FiberPool::Push([folderName, fileName] {
+			FiberPool::Push([folderName, fileName, spawnInside] {
 				const auto file = CheckFolder(folderName).GetFile(fileName).Path();
 
 				if (!std::filesystem::exists(file))
@@ -163,8 +163,14 @@ namespace YimMenu
 				try
 				{
 					file_stream >> vehicle_json;
-					if (SpawnFromJson(vehicle_json))
+					auto veh = SpawnFromJson(vehicle_json);
+
+					if (veh)
+					{
+						if (spawnInside)
+							Self::GetPed().SetInVehicle(veh.GetHandle());
 						Notifications::Show("Persist Car", std::format("Spawned {}", fileName), NotificationType::Success);
+					}
 					else
 						Notifications::Show("Persist Car", std::format("Unable to spawn {}", fileName), NotificationType::Error);
 				}
@@ -179,10 +185,10 @@ namespace YimMenu
 			Notifications::Show("Persist Car", "Select a file first", NotificationType::Warning);
 	}
 
-	bool SavedVehicles::SpawnFromJson(nlohmann::json vehicle_json)
+	Vehicle SavedVehicles::SpawnFromJson(nlohmann::json vehicle_json)
 	{
 		const Hash vehicle_hash = vehicle_json[vehicle_model_hash_key];
-		auto veh = Vehicle::Create(vehicle_hash, Self::GetPed().GetPosition(), Self::GetPed().GetHeading());
+		auto veh = Vehicle::Create(vehicle_hash, Vehicle::GetSpawnLocRelToPed(Self::GetPed().GetHandle(), vehicle_hash), Self::GetPed().GetHeading());
 
 		if (veh != nullptr)
 		{
@@ -273,10 +279,8 @@ namespace YimMenu
 				for (const auto& [extra, extra_enabled] : vehicle_extras)
 					VEHICLE::SET_VEHICLE_EXTRA(vehicle, extra, extra_enabled ? 0 : 1);
 			}
-
-			return true;
 		}
 
-		return false;
+		return veh;
 	}
 }

src/game/backend/SavedVehicles.hpp

@@ -11,12 +11,12 @@ namespace YimMenu
 
 		static void RefreshList(std::string folderName, std::vector<std::string>& folders, std::vector<std::string>& files);
 		static void Save(std::string folderName, std::string fileName);
-		static void Load(std::string folderName, std::string fileName);
+		static void Load(std::string folderName, std::string fileName, bool spawnInside);
 
 	private:
 		static nlohmann::json GetJson(Vehicle vehicle);
 		static Folder CheckFolder(std::string folderName = "");
-		static bool SpawnFromJson(nlohmann::json);
+		static Vehicle SpawnFromJson(nlohmann::json);
 
 	private:
 		static constexpr auto plate_text_key = "plate_text";

src/game/frontend/submenus/Vehicle/SavedVehicles.cpp

@@ -1,5 +1,5 @@
 #include "SavedVehicles.hpp"
-
+#include "core/commands/BoolCommand.hpp"
 #include "core/backend/FiberPool.hpp"
 #include "core/backend/ScriptMgr.hpp"
 #include "core/frontend/Notifications.hpp"
@@ -11,6 +11,8 @@
 
 namespace YimMenu::Submenus
 {
+	static BoolCommand spawnInsideSavedVehicle{"spawninsidesavedveh", "Spawn Inside", "Spawn inside the vehicle."};
+
 	std::shared_ptr<Category> BuildSavedVehiclesMenu()
 	{
 		static std::string folder{}, file{};
@@ -20,6 +22,8 @@ namespace YimMenu::Submenus
 
 		auto persistCar = std::make_shared<Category>("Saved Vehicles");
 
+		persistCar->AddItem(std::make_shared<BoolCommandItem>("spawninsidesavedveh"_J));
+
 		persistCar->AddItem(std::make_unique<ImGuiItem>([] {
 			static auto drawSaveVehicleButton = [](bool saveToNewFolder) {
 				if (!Self::GetVehicle() || !Self::GetVehicle().IsValid())
@@ -140,7 +144,7 @@ namespace YimMenu::Submenus
 				ImGui::Spacing();
 				if (ImGui::Button("Yes"))
 				{
-					SavedVehicles::Load(folder, file);
+					SavedVehicles::Load(folder, file, spawnInsideSavedVehicle.GetState());		
 					open_modal = false;
 					ImGui::CloseCurrentPopup();
 				}

src/game/frontend/submenus/Vehicle/SpawnVehicle.cpp

@@ -15,25 +15,6 @@ namespace YimMenu::Submenus
 	static BoolCommand spawnInsidePersonalVehicle{"spawninsidepv", "Spawn Inside", "Spawn inside the personal vehicle."};
 	static BoolCommand spawnClonePersonalVehicle{"spawnclonepv", "Spawn Clone", "Spawn a clone of the persone vehicle."};
 
-	static Vector3 GetVehicleSpawnLoc(joaat_t hash, bool spawnInside)
-	{
-		float y_offset = 0;
-
-		if (Self::GetVehicle().IsValid())
-		{
-			Vector3 min, max, result;
-			MISC::GET_MODEL_DIMENSIONS(hash, &min, &max);
-			result = max - min;
-			y_offset = result.y;
-		}
-		else if (!spawnInside)
-		{
-			y_offset = 5.f;
-		}
-
-		return ENTITY::GET_OFFSET_FROM_ENTITY_IN_WORLD_COORDS(Self::GetPed().GetHandle(), 0.f, y_offset, 0.f);
-	}
-
 	std::shared_ptr<TabItem> RenderSpawnNewVehicle()
 	{
 		auto tab = std::make_shared<TabItem>("New Vehicle");
@@ -129,7 +110,7 @@ namespace YimMenu::Submenus
 							if (ImGui::Selectable(name.c_str()))
 							{
 								FiberPool::Push([hash] {
-									auto handle = Vehicle::Create(hash, GetVehicleSpawnLoc(hash, spawnInsideVehicle.GetState()), Self::GetPed().GetHeading());
+									auto handle = Vehicle::Create(hash, Vehicle::GetSpawnLocRelToPed(Self::GetPed().GetHandle(), hash), Self::GetPed().GetHeading());
 
 									if (spawnInsideVehicle.GetState())
 										Self::GetPed().SetInVehicle(handle);
@@ -222,7 +203,7 @@ namespace YimMenu::Submenus
 								FiberPool::Push([&personalVeh] {
 									if (spawnClonePersonalVehicle.GetState())
 									{
-										auto coords  = GetVehicleSpawnLoc(personalVeh->GetModel(), spawnInsidePersonalVehicle.GetState());
+										auto coords  = Vehicle::GetSpawnLocRelToPed(Self::GetPed().GetHandle(), personalVeh->GetModel());
 										auto heading = Self::GetPed().GetHeading();
 										auto handle  = personalVeh->Clone(coords, heading);
 										

src/game/gta/Vehicle.cpp

@@ -274,4 +274,11 @@ namespace YimMenu
 
 		return ownedMods;
 	}
+
+	Vector3 Vehicle::GetSpawnLocRelToPed(int ped, joaat_t hash)
+	{
+		Vector3 min, max;
+		MISC::GET_MODEL_DIMENSIONS(hash, &min, &max);
+		return ENTITY::GET_OFFSET_FROM_ENTITY_IN_WORLD_COORDS(ped, 0.f, (max - min).y, 0.f);
+	}
 }

src/game/gta/Vehicle.hpp

@@ -1,5 +1,7 @@
 #pragma once
 #include "Entity.hpp"
+#include "types/script/types.hpp"
+#include "core/util/Joaat.hpp"
 
 namespace YimMenu
 {
@@ -10,14 +12,16 @@ namespace YimMenu
 
 		static Vehicle Create(std::uint32_t model, rage::fvector3 coords, float heading = 0.0f);
 
+		// health
 		void Fix();
 
 		// gears
 		int GetGear();
 		float GetRevRatio();
 
-		// speed
+		// motion
 		float GetMaxSpeed();
+		void BringToHalt(float distance = 1.0f, int duration = 1);
 
 		// mods
 		void Upgrade();
@@ -36,9 +40,11 @@ namespace YimMenu
 		// stance
 		void LowerStance(bool lower);
 
-		void BringToHalt(float distance = 1.0f, int duration = 1);
+		// position
 		bool SetOnGroundProperly();
+		static Vector3 GetSpawnLocRelToPed(int ped, joaat_t hash);
 
+		// description
 		std::string GetFullName();
 	};
 }