From a21667244377674365198760e36a48e245e256b5 Mon Sep 17 00:00:00 2001
From: Arthur Ice <addtheice@gmail.com>
Date: Thu, 4 Sep 2014 18:13:23 -0700
Subject: [PATCH] Moved add spawn from spawn group command case (5) from
 NPCSpawnDB into method AddSpawnFromSpawnGroup

---
 zone/npc.cpp  | 30 ++++++++++++++++++++----------
 zone/zonedb.h |  1 +
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/zone/npc.cpp b/zone/npc.cpp
index caf513e40..f7b7320f2 100644
--- a/zone/npc.cpp
+++ b/zone/npc.cpp
@@ -1240,6 +1240,24 @@ uint32 ZoneDatabase::DeleteSpawnRemoveFromNPCTypeTable(const char* zone, uint32
 	return 1;
 }
 
+uint32  ZoneDatabase::AddSpawnFromSpawnGroup(const char* zone, uint32 zone_version, Client *client, NPC* spawn, uint32 spawnGroupID) {
+    char errbuf[MYSQL_ERRMSG_SIZE];
+	char *query = 0;
+	MYSQL_RES *result;
+	MYSQL_ROW row;
+	uint32 tmp = 0;
+    if (!RunQuery(query, MakeAnyLenString(&query, "INSERT INTO spawn2 (zone, version, x, y, z, respawntime, heading, spawngroupID) values('%s', %u, %f, %f, %f, %i, %f, %i)", zone, zone_version, client->GetX(), client->GetY(), client->GetZ(), 120, client->GetHeading(), spawnGroupID), errbuf, 0, 0, &tmp)) {
+		safe_delete(query);
+		return false;
+	}
+
+	if(client)
+        client->LogSQL(query);
+    safe_delete_array(query);
+
+    return true;
+}
+
 uint32 ZoneDatabase::NPCSpawnDB(uint8 command, const char* zone, uint32 zone_version, Client *c, NPC* spawn, uint32 extra) {
 	char errbuf[MYSQL_ERRMSG_SIZE];
 	char *query = 0;
@@ -1265,16 +1283,8 @@ uint32 ZoneDatabase::NPCSpawnDB(uint8 command, const char* zone, uint32 zone_ver
 			return DeleteSpawnRemoveFromNPCTypeTable(zone, zone_version, c, spawn);
 		}
 		case 5: { // add a spawn from spawngroup
-			if (!RunQuery(query, MakeAnyLenString(&query, "INSERT INTO spawn2 (zone, version, x, y, z, respawntime, heading, spawngroupID) values('%s', %u, %f, %f, %f, %i, %f, %i)", zone, zone_version, c->GetX(), c->GetY(), c->GetZ(), 120, c->GetHeading(), extra), errbuf, 0, 0, &tmp)) {
-				safe_delete(query);
-				return false;
-			}
-			if(c) c->LogSQL(query);
-			safe_delete_array(query);
-
-			return true;
-			break;
-			}
+			return AddSpawnFromSpawnGroup(zone, zone_version, c, spawn, extra);
+        }
 		case 6: { // add npc_type
 			uint32 npc_type_id;
 			char tmpstr[64];
diff --git a/zone/zonedb.h b/zone/zonedb.h
index 80ad6133c..46d596cd3 100644
--- a/zone/zonedb.h
+++ b/zone/zonedb.h
@@ -376,6 +376,7 @@ public:
     uint32  AddNewNPCSpawnGroupCommand(const char* zone, uint32 zone_version, Client *client, NPC* spawn, uint32 respawnTime);
     uint32  DeleteSpawnLeaveInNPCTypeTable(const char* zone, Client *client, NPC* spawn);
     uint32  DeleteSpawnRemoveFromNPCTypeTable(const char* zone, uint32 zone_version, Client *client, NPC* spawn);
+    uint32  AddSpawnFromSpawnGroup(const char* zone, uint32 zone_version, Client *client, NPC* spawn, uint32 spawnGroupID);
     uint32  UpdateNPCTypeAppearance(Client *client, NPC* spawn);
 	bool	SetSpecialAttkFlag(uint8 id, const char* flag);
 	bool	GetPetEntry(const char *pet_type, PetRecord *into);