Merge 9fbf9abd47 into d76a8bd34a

changelog.txt

@@ -1,5 +1,9 @@
 EQEMu Changelog (Started on Sept 24, 2003 15:50)
 -------------------------------------------------------
+== 03/17/2013 ==
+Secrets: Fixed that pesky merc memleak.
+Secrets: Bit of code cleanup regarding mercs.
+
 == 03/15/2013 ==
 Derision: RoF: Added ENCODE for Resurrect_struct (Accepting a rez should now work).
 Derision: Fixed a couple of memory leaks in Rez code.

common/eq_packet_structs.h

@@ -27,6 +27,9 @@
 //#include "../common/item_struct.h"
 
 static const uint32 BUFF_COUNT = 25;
+static const uint32 MAX_MERC = 100;
+static const uint32 MAX_MERC_GRADES = 10;
+static const uint32 MAX_MERC_STANCES = 10;
 static const uint32 BLOCKED_BUFF_COUNT = 20;
 
 #include "eq_constants.h"
@@ -4871,11 +4874,28 @@ struct ItemPreview_Struct
 /*026*/	uint8	unknown026[54];
 };
 
-//Not an EQ packet, just a single int for the mercenary merchant structure.
+// Used by specific packets
-struct MercenaryGrade_Struct {
+struct MercenaryList_Struct {
-uint32 GradeCountEntry;	
+/*0000*/	uint32	MercID;				// ID unique to each type of mercenary (probably a DB id)
+/*0004*/	uint32	MercType;			// From dbstr_us.txt - Apprentice (330000100), Journeyman (330000200), Master (330000300)
+/*0008*/	uint32	MercSubType;		// From dbstr_us.txt - 330020105^23^Race: Guktan<br>Type: Healer<br>Confidence: High<br>Proficiency: Apprentice, Tier V...
+/*0012*/	uint32	PurchaseCost;		// Purchase Cost (in gold)
+/*0016*/	uint32	UpkeepCost;			// Upkeep Cost (in gold)
+/*0020*/	uint32	Status;				// Required Account Status (Free = 0, Silver = 1, Gold = 2) at merchants - Seen 0 (suspended) or 1 (unsuspended) on hired mercs ?
+/*0024*/	uint32	AltCurrencyCost;	// Alternate Currency Purchase Cost? (all seen costs show N/A Bayle Mark) - Seen 0
+/*0028*/	uint32	AltCurrencyUpkeep;	// Alternate Currency Upkeep Cost? (all seen costs show 1 Bayle Mark) - Seen 1
+/*0032*/	uint32	AltCurrencyType;	// Alternate Currency Type? - 19^17^Bayle Mark^0 - Seen 19
+/*0036*/	uint8	MercUnk01;			// Unknown (always see 0)
+/*0037*/	int32	TimeLeft;			// Unknown (always see -1 at merchant) - Seen 900000 (15 minutes in ms for newly hired merc)
+/*0041*/	uint32	MerchantSlot;		// Merchant Slot? Increments, but not always by 1 - May be for Merc Window Options (Seen 5, 36, 1 for active mercs)?
+/*0045*/	uint32	MercUnk02;			// Unknown (normally see 1, but sometimes 2 or 0)
+/*0049*/	uint32	StanceCount;		// Iterations of MercenaryStance_Struct - Normally 2 to 4 seen
+/*0053*/	int32	MercUnk03;			// Unknown (always 0 at merchant) - Seen on active merc: 93 a4 03 77, b8 ed 2f 26, 88 d5 8b c3, and 93 a4 ad 77
+/*0057*/	uint8	MercUnk04;			// Seen 1 
+/*0058*/	char	MercName[1];		// Null Terminated Mercenary Name (00 at merchants)
 };
 
+
 // Used by MercenaryMerchantList_Struct
 struct MercenaryListEntry_Struct {
 /*0000*/	uint32	MercID;				// ID unique to each type of mercenary (probably a DB id)
@@ -4895,7 +4915,7 @@ struct MercenaryListEntry_Struct {
 /*0053*/	int32	MercUnk03;			// Unknown (always 0 at merchant) - Seen on active merc: 93 a4 03 77, b8 ed 2f 26, 88 d5 8b c3, and 93 a4 ad 77
 /*0057*/	uint8	MercUnk04;			// Seen 1 
 /*0058*/	char	MercName[1];		// Null Terminated Mercenary Name (00 at merchants)
-/*0000*/	MercenaryStance_Struct* Stances;	// Count Varies, but hard set to 5 max for now - From dbstr_us.txt - 1^24^Passive^0, 2^24^Balanced^0, etc (1 to 9 as of April 2012)
+/*0000*/	MercenaryStance_Struct Stances[MAX_MERC_STANCES];	// Count Varies, but hard set to 5 max for now - From dbstr_us.txt - 1^24^Passive^0, 2^24^Balanced^0, etc (1 to 9 as of April 2012)
 };
 
 // [OPCode: 0x27ac OP_MercenaryDataResponse] On Live as of April 2 2012 [Server->Client]
@@ -4903,9 +4923,9 @@ struct MercenaryListEntry_Struct {
 // Sent by the server when browsing the Mercenary Merchant
 struct MercenaryMerchantList_Struct {
 /*0000*/	uint32	MercTypeCount;			// Number of Merc Types to follow
-/*0004*/	MercenaryGrade_Struct* MercGrades;	// Count varies, but hard set to 3 max for now - From dbstr_us.txt - Apprentice (330000100), Journeyman (330000200), Master (330000300)
+/*0004*/	uint32  MercGrades[MAX_MERC_GRADES];	// Count varies, but hard set to 3 max for now - From dbstr_us.txt - Apprentice (330000100), Journeyman (330000200), Master (330000300)
 /*0016*/	uint32	MercCount;				// Number of MercenaryInfo_Struct to follow
-/*0020*/	MercenaryListEntry_Struct* Mercs;	// Data for individual mercenaries in the Merchant List
+/*0020*/	MercenaryListEntry_Struct Mercs[MAX_MERC];	// Data for individual mercenaries in the Merchant List
 };
 
 // [OPCode: 0x4dd9 OP_MercenaryDataRequest] On Live as of April 2 2012 [Client->Server]
@@ -4935,7 +4955,7 @@ struct MercenaryData_Struct {
 /*0053*/	int32	MercUnk03;			// Unknown (always 0 at merchant) - Seen on active merc: 93 a4 03 77, b8 ed 2f 26, 88 d5 8b c3, and 93 a4 ad 77
 /*0057*/	uint8	MercUnk04;			// Seen 1 
 /*0058*/	char	MercName[64];		// Null Terminated Mercenary Name (00 at merchants)
-/*0000*/	MercenaryStance_Struct* Stances;	// Count Varies, but hard set to 2 for now - From dbstr_us.txt - 1^24^Passive^0, 2^24^Balanced^0, etc (1 to 9 as of April 2012)
+/*0000*/	MercenaryStance_Struct Stances[MAX_MERC_STANCES];	// Count Varies, but hard set to 2 for now - From dbstr_us.txt - 1^24^Passive^0, 2^24^Balanced^0, etc (1 to 9 as of April 2012)
 /*0000*/	uint32	MercUnk05;			// Seen 1 - Extra Merc Data field that differs from MercenaryListEntry_Struct
 // MercUnk05 may be a field that is at the end of the packet only, even if multiple mercs are listed (haven't seen examples of multiple mercs owned at once)
 };
@@ -4947,7 +4967,7 @@ struct MercenaryData_Struct {
 struct MercenaryDataUpdate_Struct {
 /*0000*/	int32	MercStatus;					// Seen 0 with merc and -1 with no merc hired
 /*0004*/	uint32	MercCount;					// Seen 1 with 1 merc hired and 0 with no merc hired
-/*0008*/	MercenaryData_Struct* MercData;	// Data for individual mercenaries in the Merchant List
+/*0008*/	MercenaryData_Struct MercData[MAX_MERC];	// Data for individual mercenaries in the Merchant List
 };
 
 // [OPCode: 0x6537] On Live as of April 2 2012 [Server->Client]

common/patches/RoF.cpp

@@ -2099,7 +2099,7 @@ ENCODE(OP_MercenaryDataResponse) {
 
 	for(r = 0; r < emu->MercTypeCount; r++)
 	{
-		VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->MercGrades[r].GradeCountEntry);
+		VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->MercGrades[r]);
 	}
 
 	VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->MercCount);

common/patches/SoD.cpp

@@ -1289,7 +1289,7 @@ ENCODE(OP_MercenaryDataResponse) {
 	{
 		if(emu->MercTypeCount > 0)
 		{
-			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->MercGrades[r].GradeCountEntry);
+			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->MercGrades[r]);
 		}
 	}
 	VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->MercCount);

common/patches/Underfoot.cpp

@@ -1297,7 +1297,7 @@ ENCODE(OP_MercenaryDataResponse) {
 
 	for(r = 0; r < emu->MercTypeCount; r++)
 	{
-		VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->MercGrades[r].GradeCountEntry);
+		VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->MercGrades[r]);
 	}
 
 	VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->MercCount);

zone/client.cpp

@@ -1476,7 +1476,6 @@ void Client::SendSound(){//Makes a sound.
     memset(&x[64],0xffffffff,sizeof(uint32));
 	memcpy(outapp->pBuffer,x,outapp->size);
 	QueuePacket(outapp);
-	DumpPacket(outapp);
 	safe_delete(outapp);
 
 }
@@ -7141,73 +7140,91 @@ void Client::SendMercPersonalInfo()
 
 	if (GetClientVersion() >= EQClientRoF)
 	{
-		MercenaryDataUpdate_Struct* mdus = new MercenaryDataUpdate_Struct;
-
 		MercTemplate *mercData = &zone->merc_templates[GetMercInfo().MercTemplateID];
 
 		if (mercData)
 		{
+			int i = 0;
+			int stancecount = 0;
+			stancecount += zone->merc_stance_list[GetMercInfo().MercTemplateID].size();
+
+			if(stancecount > MAX_MERC_STANCES || mercCount > MAX_MERC || mercTypeCount > MAX_MERC_GRADES)
+			{
+				SendMercMerchantResponsePacket(0);
+				return;
+			}
+			if (mercCount > 0 && mercCount)
+			{
+				EQApplicationPacket *outapp = new EQApplicationPacket(OP_MercenaryDataUpdate, sizeof(MercenaryDataUpdate_Struct));
+				MercenaryDataUpdate_Struct* mdus = (MercenaryDataUpdate_Struct*)outapp->pBuffer;
 				mdus->MercStatus = 0;
 				mdus->MercCount = mercCount;
-				if (mercCount > 0)
+				mdus->MercData[i].MercID = mercData->MercTemplateID;
+				mdus->MercData[i].MercType = mercData->MercType;
+				mdus->MercData[i].MercSubType = mercData->MercSubType;
+				mdus->MercData[i].PurchaseCost = Merc::CalcPurchaseCost(mercData->MercTemplateID, GetLevel(), 0);
+				mdus->MercData[i].UpkeepCost = Merc::CalcUpkeepCost(mercData->MercTemplateID, GetLevel(), 0);
+				mdus->MercData[i].Status = 0;
+				mdus->MercData[i].AltCurrencyCost = Merc::CalcPurchaseCost(mercData->MercTemplateID, GetLevel(), altCurrentType);
+				mdus->MercData[i].AltCurrencyUpkeep = Merc::CalcPurchaseCost(mercData->MercTemplateID, GetLevel(), altCurrentType);
+				mdus->MercData[i].AltCurrencyType = altCurrentType;
+				mdus->MercData[i].MercUnk01 = 0;
+				mdus->MercData[i].TimeLeft = GetMercInfo().MercTimerRemaining;	//GetMercTimer().GetRemainingTime();
+				mdus->MercData[i].MerchantSlot = i + 1;
+				mdus->MercData[i].MercUnk02 = 1;
+				mdus->MercData[i].StanceCount = zone->merc_stance_list[mercData->MercTemplateID].size();
+				mdus->MercData[i].MercUnk03 = 0;
+				mdus->MercData[i].MercUnk04 = 1;
+				strn0cpy(mdus->MercData[i].MercName, GetMercInfo().merc_name , sizeof(mdus->MercData[i].MercName));
+				uint32 stanceindex = 0;
+				if (mdus->MercData[i].StanceCount != 0)
 				{
-					mdus->MercData = new MercenaryData_Struct[mercCount];
+					list<MercStanceInfo>::iterator iter = zone->merc_stance_list[mercData->MercTemplateID].begin();
-					mdus->MercData[i].MercID = mercData->MercTemplateID;
+					while(iter != zone->merc_stance_list[mercData->MercTemplateID].end())
-					mdus->MercData[i].MercType = mercData->MercType;
-					mdus->MercData[i].MercSubType = mercData->MercSubType;
-					mdus->MercData[i].PurchaseCost = Merc::CalcPurchaseCost(mercData->MercTemplateID, GetLevel(), 0);
-					mdus->MercData[i].UpkeepCost = Merc::CalcUpkeepCost(mercData->MercTemplateID, GetLevel(), 0);
-					mdus->MercData[i].Status = 0;
-					mdus->MercData[i].AltCurrencyCost = Merc::CalcPurchaseCost(mercData->MercTemplateID, GetLevel(), altCurrentType);
-					mdus->MercData[i].AltCurrencyUpkeep = Merc::CalcPurchaseCost(mercData->MercTemplateID, GetLevel(), altCurrentType);
-					mdus->MercData[i].AltCurrencyType = altCurrentType;
-					mdus->MercData[i].MercUnk01 = 0;
-					mdus->MercData[i].TimeLeft = GetMercInfo().MercTimerRemaining;	//GetMercTimer().GetRemainingTime();
-					mdus->MercData[i].MerchantSlot = i + 1;
-					mdus->MercData[i].MercUnk02 = 1;
-					mdus->MercData[i].StanceCount = zone->merc_stance_list[mercData->MercTemplateID].size();
-					mdus->MercData[i].MercUnk03 = 0;
-					mdus->MercData[i].MercUnk04 = 1;
-					strn0cpy(mdus->MercData[i].MercName, GetMercInfo().merc_name , sizeof(mdus->MercData[i].MercName));
-					uint32 stanceindex = 0;
-					if (mdus->MercData[i].StanceCount != 0)
 					{
-						mdus->MercData[i].Stances = new MercenaryStance_Struct[mdus->MercData[i].StanceCount];
+						mdus->MercData[i].Stances[stanceindex].StanceIndex = stanceindex;
-						list<MercStanceInfo>::iterator iter = zone->merc_stance_list[mercData->MercTemplateID].begin();
+						mdus->MercData[i].Stances[stanceindex].Stance = (iter->StanceID);
-						while(iter != zone->merc_stance_list[mercData->MercTemplateID].end())
+						stanceindex++;
-						{
+						iter++;
-							mdus->MercData[i].Stances[stanceindex].StanceIndex = stanceindex;
-							mdus->MercData[i].Stances[stanceindex].Stance = (iter->StanceID);
-							stanceindex++;
-							iter++;
-						}
 					}
+				}
 
-					mdus->MercData[i].MercUnk05 = 1;
+				mdus->MercData[i].MercUnk05 = 1;
-
+				FastQueuePacket(&outapp);
-					EQApplicationPacket *outapp = new EQApplicationPacket(OP_MercenaryDataUpdate, 1); //Packet sizes are handled by the encoder.
+				return;
-					outapp->pBuffer = (unsigned char*)mdus;
-					//DumpPacket(outapp);
-					FastQueuePacket(&outapp);
 			}
 		}
 	}
 	else
 	{
-		MercenaryMerchantList_Struct* mml = new MercenaryMerchantList_Struct;
+		int stancecount = 0;
+		stancecount += zone->merc_stance_list[GetMercInfo().MercTemplateID].size();
+
+		if(mercCount > MAX_MERC || mercTypeCount > MAX_MERC_GRADES)
+		{
+			if (GetClientVersion() == EQClientSoD)
+			{
+				SendMercMerchantResponsePacket(0);
+			}
+			return;
+		}
+
+		EQApplicationPacket *outapp = new EQApplicationPacket(OP_MercenaryDataResponse, sizeof(MercenaryMerchantList_Struct));
+		MercenaryMerchantList_Struct* mml = (MercenaryMerchantList_Struct*)outapp->pBuffer;
 		MercTemplate *mercData = &zone->merc_templates[GetMercInfo().MercTemplateID];
 
+
 		if(mercData)
 		{
 			if(mercTypeCount > 0)
 			{
 				mml->MercTypeCount = mercTypeCount; //We only should have one merc entry.
-				mml->MercGrades = new MercenaryGrade_Struct[mercTypeCount]; // DBStringID for Type
+				mml->MercGrades[i] = 1;
 			}
 			mml->MercCount = mercCount;
 			if(mercCount > 0)
 			{
-				mml->Mercs = new MercenaryListEntry_Struct[mercCount];
+
 				mml->Mercs[i].MercID = mercData->MercTemplateID;
 				mml->Mercs[i].MercType = mercData->MercType;
 				mml->Mercs[i].MercSubType = mercData->MercSubType;
@@ -7228,7 +7245,6 @@ void Client::SendMercPersonalInfo()
 				int stanceindex = 0;
 				if(mml->Mercs[i].StanceCount != 0)
 				{
-					mml->Mercs[i].Stances = new MercenaryStance_Struct[mml->Mercs[i].StanceCount];
 					list<MercStanceInfo>::iterator iter = zone->merc_stance_list[mercData->MercTemplateID].begin();
 					while(iter != zone->merc_stance_list[mercData->MercTemplateID].end())
 					{
@@ -7238,17 +7254,31 @@ void Client::SendMercPersonalInfo()
 						iter++;
 					}
 				}
-
-				EQApplicationPacket *outapp = new EQApplicationPacket(OP_MercenaryDataResponse, 1); //Packet sizes are handled by the encoder.
-				outapp->pBuffer = (unsigned char*)mml;
-				// DumpPacket(outapp);
 				FastQueuePacket(&outapp);
 			}
+			else
+			{
+				safe_delete(outapp);
+				if (GetClientVersion() == EQClientSoD)
+				{
+					SendMercMerchantResponsePacket(0);
+				}
+				return;
+			}
 			if (GetClientVersion() == EQClientSoD)
 			{
 				SendMercMerchantResponsePacket(0);
 			}
 		}
+		else
+		{
+			safe_delete(outapp);
+			if (GetClientVersion() == EQClientSoD)
+			{
+			SendMercMerchantResponsePacket(0);
+			}
+			return;
+		}
 	}
 }
 
@@ -7259,8 +7289,6 @@ void Client::SendClearMercInfo()
 	nmhs->MercStatus = -1;
 	nmhs->MercCount = 0;
 	nmhs->MercID = 1;
-
-	DumpPacket(outapp);
 	FastQueuePacket(&outapp);
 }
 

zone/client_packet.cpp

@@ -13495,8 +13495,6 @@ void Client::Handle_OP_MercenaryDataRequest(const EQApplicationPacket *app)
 		//send info about your current merc(s)
 	}
 
-	DumpPacket(app);
-
 	if(!RuleB(Mercs, AllowMercs)) {
 		return;
 	}
@@ -13514,24 +13512,35 @@ void Client::Handle_OP_MercenaryDataRequest(const EQApplicationPacket *app)
 			return;
 		}
 
-		MercenaryMerchantList_Struct* mml = new MercenaryMerchantList_Struct;
-
 		mercTypeCount = tar->GetNumMercTypes(GetClientVersion());
 		mercCount = tar->GetNumMercs(GetClientVersion());
 
+		if(mercCount > MAX_MERC)
+		return;
 
 		std::list<MercType> mercTypeList = tar->GetMercTypesList(GetClientVersion());
 		std::list<MercData> mercDataList = tar->GetMercsList(GetClientVersion());
 
-		mml->MercTypeCount = mercTypeCount;
 		int i = 0;
+		int StanceCount = 0;
 
+		for(std::list<MercData>::iterator mercListItr = mercDataList.begin(); mercListItr != mercDataList.end(); mercListItr++)
+		{
+			list<MercStanceInfo>::iterator siter = zone->merc_stance_list[mercListItr->MercTemplateID].begin();
+			for(siter = zone->merc_stance_list[mercListItr->MercTemplateID].begin(); siter != zone->merc_stance_list[mercListItr->MercTemplateID].end(); siter++)
+			{
+				StanceCount++;
+			}
+		}
 
+		EQApplicationPacket *outapp = new EQApplicationPacket(OP_MercenaryDataResponse, sizeof(MercenaryMerchantList_Struct));
+		MercenaryMerchantList_Struct* mml = (MercenaryMerchantList_Struct*)outapp->pBuffer;
+
+		mml->MercTypeCount = mercTypeCount;
 		if(mercTypeCount > 0)
 		{
-			mml->MercGrades = new MercenaryGrade_Struct[mercTypeCount];
 			for(std::list<MercType>::iterator mercTypeListItr = mercTypeList.begin(); mercTypeListItr != mercTypeList.end(); mercTypeListItr++) {
-			mml->MercGrades[i].GradeCountEntry = mercTypeListItr->Type;	// DBStringID for Type
+			mml->MercGrades[i] = mercTypeListItr->Type;	// DBStringID for Type
 			i++;
 			}
 		}
@@ -13539,50 +13548,48 @@ void Client::Handle_OP_MercenaryDataRequest(const EQApplicationPacket *app)
 
 		if(mercCount > 0)
 		{
-			mml->Mercs = new MercenaryListEntry_Struct[mercCount];
 			i = 0;
-			for(std::list<MercData>::iterator mercListItr = mercDataList.begin(); mercListItr != mercDataList.end(); mercListItr++)
+			for(std::list<MercData>::iterator mercListIter = mercDataList.begin(); mercListIter != mercDataList.end(); mercListIter++)
 			{
-				mml->Mercs[i].MercID = mercListItr->MercTemplateID;
+				mml->Mercs[i].MercID = mercListIter->MercTemplateID;
-				mml->Mercs[i].MercType = mercListItr->MercType;
+				mml->Mercs[i].MercType = mercListIter->MercType;
-				mml->Mercs[i].MercSubType = mercListItr->MercSubType;
+				mml->Mercs[i].MercSubType = mercListIter->MercSubType;
-				mml->Mercs[i].PurchaseCost = RuleB(Mercs, ChargeMercPurchaseCost) ? Merc::CalcPurchaseCost(mercListItr->MercTemplateID, GetLevel(), 0): 0;
+				mml->Mercs[i].PurchaseCost = RuleB(Mercs, ChargeMercPurchaseCost) ? Merc::CalcPurchaseCost(mercListIter->MercTemplateID, GetLevel(), 0): 0;
-				mml->Mercs[i].UpkeepCost = RuleB(Mercs, ChargeMercUpkeepCost) ? Merc::CalcUpkeepCost(mercListItr->MercTemplateID, GetLevel(), 0): 0;
+				mml->Mercs[i].UpkeepCost = RuleB(Mercs, ChargeMercUpkeepCost) ? Merc::CalcUpkeepCost(mercListIter->MercTemplateID, GetLevel(), 0): 0;
 				mml->Mercs[i].Status = 0;
-				mml->Mercs[i].AltCurrencyCost = RuleB(Mercs, ChargeMercPurchaseCost) ? Merc::CalcPurchaseCost(mercListItr->MercTemplateID, GetLevel(), altCurrentType): 0;
+				mml->Mercs[i].AltCurrencyCost = RuleB(Mercs, ChargeMercPurchaseCost) ? Merc::CalcPurchaseCost(mercListIter->MercTemplateID, GetLevel(), altCurrentType): 0;
-				mml->Mercs[i].AltCurrencyUpkeep = RuleB(Mercs, ChargeMercUpkeepCost) ? Merc::CalcUpkeepCost(mercListItr->MercTemplateID, GetLevel(), altCurrentType): 0;
+				mml->Mercs[i].AltCurrencyUpkeep = RuleB(Mercs, ChargeMercUpkeepCost) ? Merc::CalcUpkeepCost(mercListIter->MercTemplateID, GetLevel(), altCurrentType): 0;
 				mml->Mercs[i].AltCurrencyType = altCurrentType;
 				mml->Mercs[i].MercUnk01 = 0;
 				mml->Mercs[i].TimeLeft = -1;
 				mml->Mercs[i].MerchantSlot = i + 1;
 				mml->Mercs[i].MercUnk02 = 1;
-				mml->Mercs[i].StanceCount = zone->merc_stance_list[mercListItr->MercTemplateID].size();
+				int mercStanceCount = 0;
+				list<MercStanceInfo>::iterator iter = zone->merc_stance_list[mercListIter->MercTemplateID].begin();
+				for(iter = zone->merc_stance_list[mercListIter->MercTemplateID].begin(); iter != zone->merc_stance_list[mercListIter->MercTemplateID].end(); iter++)
+				{
+				mercStanceCount++;
+				}
+				mml->Mercs[i].StanceCount = mercStanceCount;
 				mml->Mercs[i].MercUnk03 = 519044964;
 				mml->Mercs[i].MercUnk04 = 1;
 				//mml->Mercs[i].MercName;
 				int stanceindex = 0;
-				if(mml->Mercs[i].StanceCount != 0)
+				if(mercStanceCount > 0)
 				{
-					mml->Mercs[i].Stances = new MercenaryStance_Struct[mml->Mercs[i].StanceCount];
+					list<MercStanceInfo>::iterator iter2 = zone->merc_stance_list[mercListIter->MercTemplateID].begin();
-					list<MercStanceInfo>::iterator iter = zone->merc_stance_list[mercListItr->MercTemplateID].begin();
+					while(iter2 != zone->merc_stance_list[mercListIter->MercTemplateID].end())
-					while(iter != zone->merc_stance_list[mercListItr->MercTemplateID].end())
 					{
 						mml->Mercs[i].Stances[stanceindex].StanceIndex = stanceindex;
-						mml->Mercs[i].Stances[stanceindex].Stance = (iter->StanceID);
+						mml->Mercs[i].Stances[stanceindex].Stance = (iter2->StanceID);
 						stanceindex++;
-						iter++;
+						iter2++;
 					}
 				}
 				i++;
 			}
 		}
-
-
-		EQApplicationPacket *outapp = new EQApplicationPacket(OP_MercenaryDataResponse, 1); //Packet sizes are handled by the encoder.
-		outapp->pBuffer = (unsigned char*)mml;
-	//	DumpPacket(outapp);
 		FastQueuePacket(&outapp);
-
 	}
 }
 
@@ -13604,7 +13611,7 @@ void Client::Handle_OP_MercenaryHire(const EQApplicationPacket *app)
 	uint32 merc_unk1 = mmrq->MercUnk01;
 	uint32 merc_unk2 = mmrq->MercUnk02;
 
-	DumpPacket(app);
+	//DumpPacket(app);
 
 	if(MERC_DEBUG > 0)
 		Message(7, "Mercenary Debug: Template ID (%i), Merchant ID (%i), Unknown1 (%i), Unknown2 (%i)", merc_template_id, merchant_id, merc_unk1, merc_unk2);
@@ -13667,7 +13674,7 @@ void Client::Handle_OP_MercenarySuspendRequest(const EQApplicationPacket *app)
 	SuspendMercenary_Struct* sm = (SuspendMercenary_Struct*) app->pBuffer;
 	uint32 merc_suspend = sm->SuspendMerc;	// Seen 30 for suspending or unsuspending
 
-	DumpPacket(app);
+	//DumpPacket(app);
 
 	if(MERC_DEBUG > 0)
 		Message(7, "Mercenary Debug: Suspend ( %i ) received.", merc_suspend);
@@ -13693,7 +13700,7 @@ void Client::Handle_OP_MercenaryCommand(const EQApplicationPacket *app)
 	uint32 merc_command = mc->MercCommand;	// Seen 0 (zone in with no merc or suspended), 1 (dismiss merc), 5 (normal state), 20 (unknown), 36 (zone in with merc)
 	int32 option = mc->Option;	// Seen -1 (zone in with no merc), 0 (setting to passive stance), 1 (normal or setting to balanced stance)
 
-	DumpPacket(app);
+	//DumpPacket(app);
 
 	if(MERC_DEBUG > 0)
 		Message(7, "Mercenary Debug: Command %i, Option %i received.", merc_command, option);
@@ -13747,7 +13754,7 @@ void Client::Handle_OP_MercenaryDataUpdateRequest(const EQApplicationPacket *app
 		return;
 	}
 
-	DumpPacket(app);
+	//DumpPacket(app);
 
 	if(MERC_DEBUG > 0)
 		Message(7, "Mercenary Debug: Data Update Request Received.");
@@ -13769,7 +13776,7 @@ void Client::Handle_OP_MercenaryDismiss(const EQApplicationPacket *app)
 		return;
 	}
 
-	DumpPacket(app);
+	//DumpPacket(app);
 
 	uint8 Command = 0;
 	if(app->size > 0)
@@ -13789,7 +13796,7 @@ void Client::Handle_OP_MercenaryDismiss(const EQApplicationPacket *app)
 			merc->Dismiss();
 	}
 
-	// Unsure if there is a server response to this packet
+	SendMercMerchantResponsePacket(10);
 
 }
 
@@ -13804,7 +13811,7 @@ void Client::Handle_OP_MercenaryTimerRequest(const EQApplicationPacket *app)
 		return;
 	}
 
-	DumpPacket(app);
+	//DumpPacket(app);
 
 	if(MERC_DEBUG > 0)
 		Message(7, "Mercenary Debug: Timer Request received.");

zone/merc.cpp

@@ -5627,7 +5627,7 @@ bool Merc::Unsuspend(bool setMaxStats) {
 		if(!mercOwner->IsGrouped())
 		{
 			Group *g = new Group(mercOwner);
-			if(AddMercToGroup(this, g))
+			if(g && AddMercToGroup(this, g))
 			{
 				entity_list.AddGroup(g);
 				database.SetGroupLeaderName(g->GetID(), mercOwner->GetName());
@@ -5638,6 +5638,15 @@ bool Merc::Unsuspend(bool setMaxStats) {
 
 				loaded = true;
 			}
+			else
+			{
+			if(MERC_DEBUG > 0)
+				mercOwner->Message(7, "Mercenary failed to join the group - Suspending");
+
+			Suspend();
+				safe_delete(g);
+				return false;
+			}
 		}
 		else if (AddMercToGroup(this, mercOwner->GetGroup()))
 		{
@@ -5877,24 +5886,18 @@ void Client::SendMercMerchantResponsePacket(int32 response_type) {
 	EQApplicationPacket *outapp = new EQApplicationPacket(OP_MercenaryHire, sizeof(MercenaryMerchantResponse_Struct));
 	MercenaryMerchantResponse_Struct* mmr = (MercenaryMerchantResponse_Struct*)outapp->pBuffer;
 	mmr->ResponseType = response_type;		// send specified response type
-
-	DumpPacket(outapp);
 	FastQueuePacket(&outapp);
 }
 
 void Client::SendMercenaryUnknownPacket(uint8 type) {
 	EQApplicationPacket *outapp = new EQApplicationPacket(OP_MercenaryUnknown1, 1);
 	outapp->WriteUInt8(type);
-
-	DumpPacket(outapp);
 	FastQueuePacket(&outapp);
 }
 
 void Client::SendMercenaryUnsuspendPacket(uint8 type) {
 	EQApplicationPacket *outapp = new EQApplicationPacket(OP_MercenaryUnsuspendResponse, 1);
 	outapp->WriteUInt8(type);
-
-	DumpPacket(outapp);
 	FastQueuePacket(&outapp);
 }
 
@@ -5902,8 +5905,6 @@ void Client::SendMercSuspendResponsePacket(uint32 suspended_time) {
 	EQApplicationPacket *outapp = new EQApplicationPacket(OP_MercenarySuspendResponse, sizeof(SuspendMercenaryResponse_Struct));
 	SuspendMercenaryResponse_Struct* smr = (SuspendMercenaryResponse_Struct*)outapp->pBuffer;
 	smr->SuspendTime = suspended_time;		// Seen 0 (not suspended) or c9 c2 64 4f (suspended on Sat Mar 17 11:58:49 2012) - Unix Timestamp
-
-	DumpPacket(outapp);
 	FastQueuePacket(&outapp);
 }
 
@@ -5921,8 +5922,6 @@ void Client::SendMercTimerPacket(int32 entity_id, int32 merc_state, int32 suspen
 	mss->MercUnk01 = unk01; // Seen 180000 - 3 minutes in ms - Used for the unsuspend button refresh timer
 	mss->MercState = merc_state; // Seen 5 (normal) or 1 (suspended)
 	mss->SuspendedTime = suspended_time; // Seen 0 for not suspended or Unix Timestamp for suspended merc
-
-	DumpPacket(outapp);
 	FastQueuePacket(&outapp);
 }
 

zone/worldserver.cpp

@@ -392,7 +392,6 @@ void WorldServer::Process() {
 					_log(ZONE__WORLD, "Error: WhoAllReturnStruct did not point to a valid client!  "
 						"id=%i, playerineqstring=%i, playersinzonestring=%i.  Dumping WhoAllReturnStruct:",
 						wars->id, wars->playerineqstring, wars->playersinzonestring);
-					//DumpPacket(pack);
 					#endif
 				}
 			}
@@ -495,7 +494,7 @@ void WorldServer::Process() {
 			if (!(Zone::Bootup(zst->zoneid, zst->instanceid, zst->makestatic))) {
 				SendChannelMessage(0, 0, 10, 0, 0, "%s:%i Zone::Bootup failed: %s", net.GetZoneAddress(), net.GetZonePort(), database.GetZoneName(zst->zoneid));
 			}
-			// Moved annoucement to ZoneBootup() - Quagmire
+			// Moved annoucement to ZoneBootup()
 			//			else
 			//				SendEmoteMessage(0, 0, 15, "Zone bootup: %s", zone->GetLongName());
 			break;
@@ -1822,7 +1821,6 @@ void WorldServer::Process() {
 		default: {
 			cout << " Unknown ZSopcode:" << (int)pack->opcode;
 			cout << " size:" << pack->size << endl;
-			//DumpPacket(pack->pBuffer, pack->size);
 			break;
 		}
 		}