consolidate code

dGame/dUtilities/VanityUtilities.cpp

@@ -18,6 +18,7 @@
 #include "Spawner.h"
 #include "dZoneManager.h"
 #include "../dWorldServer/ObjectIDManager.h"
+#include "Level.h"
 
 #include <fstream>
 
@@ -95,7 +96,6 @@ void VanityUtilities::SpawnVanity() {
 			
 			taken.push_back(npcIndex);
 
-			// Spawn the NPC
 			LOG("ldf size is %i", npc.ldf.size());
 			if (npc.ldf.empty()) {
 				npc.ldf = {
@@ -105,12 +105,16 @@ void VanityUtilities::SpawnVanity() {
 			}
 
 			// Spawn the NPC
+			if (npc.m_LOT == 176){
+				npc.m_ID = SpawnSpawner(npc.m_LOT, location.m_Position, location.m_Rotation, npc.ldf);
+			} else {
 				auto* npcEntity = SpawnNPC(npc.m_LOT, npc.m_Name, location.m_Position, location.m_Rotation, npc.m_Equipment, npc.ldf);
 				if (!npc.m_Phrases.empty()) {
 					npcEntity->SetVar<std::vector<std::string>>(u"chats", m_PartyPhrases);
 					SetupNPCTalk(npcEntity);
 				}
 			}
+		}
 		return;
 	}
 
@@ -137,9 +141,7 @@ void VanityUtilities::SpawnVanity() {
 			};
 		}
 		if (npc.m_LOT == 176){
-			auto* spawner = SpawnSpawner(npc.m_LOT, location.m_Position, location.m_Rotation, npc.ldf);
+			npc.m_ID = SpawnSpawner(npc.m_LOT, location.m_Position, location.m_Rotation, npc.ldf);
-			if (!spawner) continue;
-			npc.m_ID = spawner->m_Info.spawnerID;
 		} else {
 			// Spawn the NPC
 			auto* npcEntity = SpawnNPC(npc.m_LOT, npc.m_Name, location.m_Position, location.m_Rotation, npc.m_Equipment, npc.ldf);
@@ -181,76 +183,19 @@ void VanityUtilities::SpawnVanity() {
 	}
 }
 
-Spawner* VanityUtilities::SpawnSpawner(LOT lot, const NiPoint3& position, const NiQuaternion& rotation, const std::vector<LDFBaseData*>& ldf){
+LWOOBJID VanityUtilities::SpawnSpawner(LOT lot, const NiPoint3& position, const NiQuaternion& rotation, const std::vector<LDFBaseData*>& ldf){
-	SpawnerInfo spawnInfo = SpawnerInfo();
+	SceneObject obj;
-	SpawnerNode* node = new SpawnerNode();
+	obj.lot = lot;
-	spawnInfo.templateID = lot;
+	// guratantee we have no collisions
-	spawnInfo.spawnerID = ObjectIDManager::Instance()->GenerateObjectID();
+	do {
-	spawnInfo.templateScale = 1.0;
+		obj.id = ObjectIDManager::Instance()->GenerateObjectID();
-	node->position = position;
+	} while(Game::zoneManager->GetSpawner(obj.id));
-	node->rotation = rotation;
+	obj.position = position;
-	node->config = ldf;
+	obj.rotation = rotation;
-	spawnInfo.nodes.push_back(node);
+	obj.settings = ldf;
-	for (LDFBaseData* data : node->config) {
+	Level::MakeSpawner(obj);
-		if (data) {
+	LOG("created spawner %llu", obj.id);
-			if (data->GetKey() == u"spawntemplate") {
+	return obj.id;
-				spawnInfo.templateID = std::stoi(data->GetValueAsString());
-			}
-
-			if (data->GetKey() == u"spawner_node_id") {
-				node->nodeID = std::stoi(data->GetValueAsString());
-			}
-
-			if (data->GetKey() == u"spawner_name") {
-				spawnInfo.name = data->GetValueAsString();
-			}
-
-			if (data->GetKey() == u"max_to_spawn") {
-				spawnInfo.maxToSpawn = std::stoi(data->GetValueAsString());
-			}
-
-			if (data->GetKey() == u"spawner_active_on_load") {
-				spawnInfo.activeOnLoad = std::stoi(data->GetValueAsString());
-			}
-
-			if (data->GetKey() == u"active_on_load") {
-				spawnInfo.activeOnLoad = std::stoi(data->GetValueAsString());
-			}
-
-			if (data->GetKey() == u"respawn") {
-				if (data->GetValueType() == eLDFType::LDF_TYPE_FLOAT) // Floats are in seconds
-				{
-					spawnInfo.respawnTime = std::stof(data->GetValueAsString());
-				} else if (data->GetValueType() == eLDFType::LDF_TYPE_U32) // Ints are in ms?
-				{
-					spawnInfo.respawnTime = std::stoul(data->GetValueAsString()) / 1000;
-				}
-			}
-			if (data->GetKey() == u"spawnsGroupOnSmash") {
-				spawnInfo.spawnsOnSmash = std::stoi(data->GetValueAsString());
-			}
-			if (data->GetKey() == u"spawnNetNameForSpawnGroupOnSmash") {
-				spawnInfo.spawnOnSmashGroupName = data->GetValueAsString();
-			}
-			if (data->GetKey() == u"groupID") { // Load object groups
-				std::string groupStr = data->GetValueAsString();
-				spawnInfo.groups = GeneralUtils::SplitString(groupStr, ';');
-				spawnInfo.groups.erase(spawnInfo.groups.end() - 1);
-			}
-			if (data->GetKey() == u"no_auto_spawn") {
-				spawnInfo.noAutoSpawn = static_cast<LDFData<bool>*>(data)->GetValue();
-			}
-			if (data->GetKey() == u"no_timed_spawn") {
-				spawnInfo.noTimedSpawn = static_cast<LDFData<bool>*>(data)->GetValue();
-			}
-			if (data->GetKey() == u"spawnActivator") {
-				spawnInfo.spawnActivator = static_cast<LDFData<bool>*>(data)->GetValue();
-			}
-		}
-	}
-	auto* spawner = new Spawner(spawnInfo);
-	Game::zoneManager->AddSpawner(spawnInfo.spawnerID, spawner);
-	return spawner;
 }
 
 Entity* VanityUtilities::SpawnNPC(LOT lot, const std::string& name, const NiPoint3& position, const NiQuaternion& rotation, const std::vector<LOT>& inventory, const std::vector<LDFBaseData*>& ldf) {

dGame/dUtilities/VanityUtilities.h

@@ -45,7 +45,7 @@ public:
 		const std::vector<LDFBaseData*>& ldf
 	);
 
-	static Spawner* SpawnSpawner(
+	static LWOOBJID SpawnSpawner(
 		LOT lot,
 		const NiPoint3& position,
 		const NiQuaternion& rotation,

dZoneManager/Level.cpp

@@ -38,6 +38,76 @@ Level::~Level() {
 	}
 }
 
+void Level::MakeSpawner(SceneObject obj){
+	SpawnerInfo spawnInfo = SpawnerInfo();
+	SpawnerNode* node = new SpawnerNode();
+	spawnInfo.templateID = obj.lot;
+	spawnInfo.spawnerID = obj.id;
+	spawnInfo.templateScale = obj.scale;
+	node->position = obj.position;
+	node->rotation = obj.rotation;
+	node->config = obj.settings;
+	spawnInfo.nodes.push_back(node);
+	for (LDFBaseData* data : obj.settings) {
+	if (data) {
+		if (data->GetKey() == u"spawntemplate") {
+			spawnInfo.templateID = std::stoi(data->GetValueAsString());
+		}
+
+		if (data->GetKey() == u"spawner_node_id") {
+			node->nodeID = std::stoi(data->GetValueAsString());
+		}
+
+		if (data->GetKey() == u"spawner_name") {
+			spawnInfo.name = data->GetValueAsString();
+		}
+
+		if (data->GetKey() == u"max_to_spawn") {
+			spawnInfo.maxToSpawn = std::stoi(data->GetValueAsString());
+		}
+
+		if (data->GetKey() == u"spawner_active_on_load") {
+			spawnInfo.activeOnLoad = std::stoi(data->GetValueAsString());
+		}
+
+		if (data->GetKey() == u"active_on_load") {
+			spawnInfo.activeOnLoad = std::stoi(data->GetValueAsString());
+		}
+
+		if (data->GetKey() == u"respawn") {
+			if (data->GetValueType() == eLDFType::LDF_TYPE_FLOAT) // Floats are in seconds
+			{
+				spawnInfo.respawnTime = std::stof(data->GetValueAsString());
+			} else if (data->GetValueType() == eLDFType::LDF_TYPE_U32) // Ints are in ms?
+			{
+				spawnInfo.respawnTime = std::stoul(data->GetValueAsString()) / 1000;
+			}
+		}
+		if (data->GetKey() == u"spawnsGroupOnSmash") {
+			spawnInfo.spawnsOnSmash = std::stoi(data->GetValueAsString());
+		}
+		if (data->GetKey() == u"spawnNetNameForSpawnGroupOnSmash") {
+			spawnInfo.spawnOnSmashGroupName = data->GetValueAsString();
+		}
+		if (data->GetKey() == u"groupID") { // Load object groups
+			std::string groupStr = data->GetValueAsString();
+			spawnInfo.groups = GeneralUtils::SplitString(groupStr, ';');
+			spawnInfo.groups.erase(spawnInfo.groups.end() - 1);
+		}
+		if (data->GetKey() == u"no_auto_spawn") {
+			spawnInfo.noAutoSpawn = static_cast<LDFData<bool>*>(data)->GetValue();
+		}
+		if (data->GetKey() == u"no_timed_spawn") {
+			spawnInfo.noTimedSpawn = static_cast<LDFData<bool>*>(data)->GetValue();
+		}
+		if (data->GetKey() == u"spawnActivator") {
+			spawnInfo.spawnActivator = static_cast<LDFData<bool>*>(data)->GetValue();
+		}
+	}
+	}
+	Game::zoneManager->MakeSpawner(spawnInfo);
+}
+
 const void Level::PrintAllObjects() {
 	for (std::map<uint32_t, Header>::iterator it = m_ChunkHeaders.begin(); it != m_ChunkHeaders.end(); ++it) {
 		if (it->second.id == Level::ChunkTypeID::SceneObjectData) {
@@ -230,74 +300,7 @@ void Level::ReadSceneObjectDataChunk(std::istream& file, Header& header) {
 		}
 
 		if (obj.lot == 176) { //Spawner
-			SpawnerInfo spawnInfo = SpawnerInfo();
+			MakeSpawner(obj);
-			SpawnerNode* node = new SpawnerNode();
-			spawnInfo.templateID = obj.lot;
-			spawnInfo.spawnerID = obj.id;
-			spawnInfo.templateScale = obj.scale;
-			node->position = obj.position;
-			node->rotation = obj.rotation;
-			node->config = obj.settings;
-			spawnInfo.nodes.push_back(node);
-			for (LDFBaseData* data : obj.settings) {
-				if (data) {
-					if (data->GetKey() == u"spawntemplate") {
-						spawnInfo.templateID = std::stoi(data->GetValueAsString());
-					}
-
-					if (data->GetKey() == u"spawner_node_id") {
-						node->nodeID = std::stoi(data->GetValueAsString());
-					}
-
-					if (data->GetKey() == u"spawner_name") {
-						spawnInfo.name = data->GetValueAsString();
-					}
-
-					if (data->GetKey() == u"max_to_spawn") {
-						spawnInfo.maxToSpawn = std::stoi(data->GetValueAsString());
-					}
-
-					if (data->GetKey() == u"spawner_active_on_load") {
-						spawnInfo.activeOnLoad = std::stoi(data->GetValueAsString());
-					}
-
-					if (data->GetKey() == u"active_on_load") {
-						spawnInfo.activeOnLoad = std::stoi(data->GetValueAsString());
-					}
-
-					if (data->GetKey() == u"respawn") {
-						if (data->GetValueType() == eLDFType::LDF_TYPE_FLOAT) // Floats are in seconds
-						{
-							spawnInfo.respawnTime = std::stof(data->GetValueAsString());
-						} else if (data->GetValueType() == eLDFType::LDF_TYPE_U32) // Ints are in ms?
-						{
-							spawnInfo.respawnTime = std::stoul(data->GetValueAsString()) / 1000;
-						}
-					}
-					if (data->GetKey() == u"spawnsGroupOnSmash") {
-						spawnInfo.spawnsOnSmash = std::stoi(data->GetValueAsString());
-					}
-					if (data->GetKey() == u"spawnNetNameForSpawnGroupOnSmash") {
-						spawnInfo.spawnOnSmashGroupName = data->GetValueAsString();
-					}
-					if (data->GetKey() == u"groupID") { // Load object groups
-						std::string groupStr = data->GetValueAsString();
-						spawnInfo.groups = GeneralUtils::SplitString(groupStr, ';');
-						spawnInfo.groups.erase(spawnInfo.groups.end() - 1);
-					}
-					if (data->GetKey() == u"no_auto_spawn") {
-						spawnInfo.noAutoSpawn = static_cast<LDFData<bool>*>(data)->GetValue();
-					}
-					if (data->GetKey() == u"no_timed_spawn") {
-						spawnInfo.noTimedSpawn = static_cast<LDFData<bool>*>(data)->GetValue();
-					}
-					if (data->GetKey() == u"spawnActivator") {
-						spawnInfo.spawnActivator = static_cast<LDFData<bool>*>(data)->GetValue();
-					}
-				}
-			}
-			Spawner* spawner = new Spawner(spawnInfo);
-			Game::zoneManager->AddSpawner(obj.id, spawner);
 		} else { //Regular object
 			EntityInfo info;
 			info.spawnerID = 0;

dZoneManager/Level.h

@@ -54,6 +54,8 @@ public:
 	Level(Zone* parentZone, const std::string& filepath);
 	~Level();
 	
+	static void MakeSpawner(SceneObject obj);
+
 	const void PrintAllObjects();
 
 	std::map<uint32_t, Header> m_ChunkHeaders;