Merge branch 'master' into profiler

common/database.h

@@ -107,9 +107,9 @@ public:
 
 	/* General Information Queries */
 
-	bool	AddBannedIP(char* bannedIP, const char* notes); //Lieka Edit: Add IP address to the Banned_IPs table.
+	bool	AddBannedIP(char* bannedIP, const char* notes); //Add IP address to the Banned_IPs table.
 	bool	AddGMIP(char* ip_address, char* name);
-	bool	CheckBannedIPs(const char* loginIP); //Lieka Edit: Check incoming connection against banned IP table.
+	bool	CheckBannedIPs(const char* loginIP); //Check incoming connection against banned IP table.
 	bool	CheckGMIPs(const char* loginIP, uint32 account_id);
 	bool	CheckNameFilter(const char* name, bool surname = false);
 	bool	CheckUsedName(const char* name);
@@ -118,7 +118,7 @@ public:
 	uint32	GetAccountIDByChar(uint32 char_id);
 	uint32	GetAccountIDByName(const char* accname, int16* status = 0, uint32* lsid = 0);
 	uint32	GetCharacterID(const char *name);
-	uint32	GetCharacterInfo(const char* iName, uint32* oAccID = 0, uint32* oZoneID = 0, uint32* oInstanceID = 0,float* oX = 0, float* oY = 0, float* oZ = 0);
+	uint32	GetCharacterInfo(const char* iName, uint32* oAccID = 0, uint32* oZoneID = 0, uint32* oInstanceID = 0, float* oX = 0, float* oY = 0, float* oZ = 0);
 	uint32	GetGuildIDByCharID(uint32 char_id);
 
 	void	GetAccountName(uint32 accountid, char* name, uint32* oLSAccountID = 0);

common/eq_constants.h

@@ -368,7 +368,7 @@ enum {
 #define AT_DamageState	44	// The damage state of a destructible object (0 through 4)
 //#define AT_Trader		300	// Bazzar Trader Mode
 
-// solar: animations for AT_Anim
+// animations for AT_Anim
 #define ANIM_FREEZE	102
 #define	ANIM_STAND		0x64
 #define	ANIM_SIT		0x6e

common/eq_packet_structs.h

@@ -540,7 +540,7 @@ struct SpawnAppearance_Struct
 };
 
 
-// solar: this is used inside profile
+// this is used inside profile
 struct SpellBuff_Struct
 {
 /*000*/	uint8	slotid;		//badly named... seems to be 2 for a real buff, 0 otherwise
@@ -1268,7 +1268,7 @@ struct Animation_Struct {
 /*04*/
 };
 
-// solar: this is what causes the caster to animate and the target to
+// this is what causes the caster to animate and the target to
 // get the particle effects around them when a spell is cast
 // also causes a buff icon
 struct Action_Struct
@@ -1292,7 +1292,7 @@ struct Action_Struct
  /* 31 */
 };
 
-// solar: this is what prints the You have been struck. and the regular
+// this is what prints the You have been struck. and the regular
 // melee messages like You try to pierce, etc. It's basically the melee
 // and spell damage message
 struct CombatDamage_Struct
@@ -1811,7 +1811,7 @@ struct RandomReq_Struct {
 	uint32 high;
 };
 
-/* solar: 9/23/03 reply to /random command; struct from Zaphod */
+/* 9/23/03 reply to /random command */
 struct RandomReply_Struct {
 /* 00 */	uint32 low;
 /* 04 */	uint32 high;

common/eqemu_logsys.cpp

@@ -72,7 +72,7 @@ namespace Console {
 		LightRed = 12,
 		LightMagenta = 13,
 		Yellow = 14,
-		White = 15,
+		White = 15
 	};
 }
 
@@ -174,7 +174,7 @@ void EQEmuLogSys::ProcessLogWrite(uint16 debug_level, uint16 log_category, const
 		process_log << time_stamp << " " << message << std::endl;
 }
 
-uint16 EQEmuLogSys::GetWindowsConsoleColorFromCategory(uint16 log_category){
+uint16 EQEmuLogSys::GetWindowsConsoleColorFromCategory(uint16 log_category) {
 	switch (log_category) {
 		case Logs::Status:
 		case Logs::Normal:
@@ -197,7 +197,7 @@ uint16 EQEmuLogSys::GetWindowsConsoleColorFromCategory(uint16 log_category){
 	}
 }
 
-std::string EQEmuLogSys::GetLinuxConsoleColorFromCategory(uint16 log_category){
+std::string EQEmuLogSys::GetLinuxConsoleColorFromCategory(uint16 log_category) {
 	switch (log_category) {
 		case Logs::Status:
 		case Logs::Normal:
@@ -220,7 +220,7 @@ std::string EQEmuLogSys::GetLinuxConsoleColorFromCategory(uint16 log_category){
 	}
 }
 
-uint16 EQEmuLogSys::GetGMSayColorFromCategory(uint16 log_category){
+uint16 EQEmuLogSys::GetGMSayColorFromCategory(uint16 log_category) {
 	switch (log_category) {
 		case Logs::Status:
 		case Logs::Normal:
@@ -317,7 +317,7 @@ void EQEmuLogSys::MakeDirectory(const std::string &directory_name)
 
 void EQEmuLogSys::CloseFileLogs()
 {
-	if (process_log.is_open()){
+	if (process_log.is_open()) {
 		process_log.close();
 	}
 }

common/eqemu_logsys.h

@@ -26,11 +26,11 @@
 
 #include "types.h"
 
-namespace Logs{
+namespace Logs {
 	enum DebugLevel {
 		General = 1,	/* 1 - Low-Level general debugging, useful info on single line */
 		Moderate,		/* 2 - Informational based, used in functions, when particular things load */
-		Detail,			/* 3 - Use this for extreme detail in logging, usually in extreme debugging in the stack or interprocess communication */
+		Detail			/* 3 - Use this for extreme detail in logging, usually in extreme debugging in the stack or interprocess communication */
 	};
 
 	/*
@@ -121,7 +121,7 @@ namespace Logs{
 		"MySQL Error",
 		"MySQL Query",
 		"Mercenaries",
-		"Quest Debug",
+		"Quest Debug"
 	};
 }
 
@@ -156,7 +156,7 @@ public:
 		log_to_gmsay[category_id] = [1-3] - Sets debug level for category to output to gmsay
 	*/
 
-	struct LogSettings{
+	struct LogSettings {
 		uint8 log_to_file;
 		uint8 log_to_console;
 		uint8 log_to_gmsay;

common/patches/rof2_structs.h

@@ -1394,7 +1394,7 @@ struct Animation_Struct {
 /*04*/
 };
 
-// solar: this is what causes the caster to animate and the target to
+// this is what causes the caster to animate and the target to
 // get the particle effects around them when a spell is cast
 // also causes a buff icon
 struct Action_Struct
@@ -1445,7 +1445,7 @@ struct ActionAlt_Struct
 /*56*/
 };
 
-// solar: this is what prints the You have been struck. and the regular
+// this is what prints the You have been struck. and the regular
 // melee messages like You try to pierce, etc.  It's basically the melee
 // and spell damage message
 struct CombatDamage_Struct
@@ -1997,7 +1997,7 @@ struct RandomReq_Struct {
 	uint32 high;
 };
 
-/* solar: 9/23/03 reply to /random command; struct from Zaphod */
+/* 9/23/03 reply to /random command */
 struct RandomReply_Struct {
 /* 00 */	uint32 low;
 /* 04 */	uint32 high;

common/patches/rof_structs.h

@@ -1425,7 +1425,7 @@ struct Animation_Struct {
 /*04*/
 };
 
-// solar: this is what causes the caster to animate and the target to
+// this is what causes the caster to animate and the target to
 // get the particle effects around them when a spell is cast
 // also causes a buff icon
 struct Action_Struct
@@ -1476,7 +1476,7 @@ struct ActionAlt_Struct
 /*56*/
 };
 
-// solar: this is what prints the You have been struck. and the regular
+// this is what prints the You have been struck. and the regular
 // melee messages like You try to pierce, etc.  It's basically the melee
 // and spell damage message
 struct CombatDamage_Struct
@@ -2028,7 +2028,7 @@ struct RandomReq_Struct {
 	uint32 high;
 };
 
-/* solar: 9/23/03 reply to /random command; struct from Zaphod */
+/* 9/23/03 reply to /random command */
 struct RandomReply_Struct {
 /* 00 */	uint32 low;
 /* 04 */	uint32 high;

common/patches/sod_structs.h

@@ -538,7 +538,7 @@ struct SpawnAppearance_Struct
 };
 
 
-// solar: this is used inside profile
+// this is used inside profile
 struct SpellBuff_Struct
 {
 /*000*/	uint8	slotid;		//badly named... seems to be 2 for a real buff, 0 otherwise
@@ -1196,7 +1196,7 @@ struct Animation_Struct {
 /*04*/
 };
 
-// solar: this is what causes the caster to animate and the target to
+// this is what causes the caster to animate and the target to
 // get the particle effects around them when a spell is cast
 // also causes a buff icon
 struct Action_Struct
@@ -1248,7 +1248,7 @@ struct ActionAlt_Struct // ActionAlt_Struct - Size: 56 bytes
 /*0056*/
 };
 
-// solar: this is what prints the You have been struck. and the regular
+// this is what prints the You have been struck. and the regular
 // melee messages like You try to pierce, etc.  It's basically the melee
 // and spell damage message
 struct CombatDamage_Struct
@@ -1791,7 +1791,7 @@ struct RandomReq_Struct {
 	uint32 high;
 };
 
-/* solar: 9/23/03 reply to /random command; struct from Zaphod */
+/* 9/23/03 reply to /random command */
 struct RandomReply_Struct {
 /* 00 */	uint32 low;
 /* 04 */	uint32 high;

common/patches/sof_structs.h

@@ -515,7 +515,7 @@ struct SpawnAppearance_Struct
 };
 
 
-// solar: this is used inside profile
+// this is used inside profile
 struct SpellBuff_Struct
 {
 /*000*/	uint8	slotid;		//badly named... seems to be 2 for a real buff, 0 otherwise
@@ -1172,7 +1172,7 @@ struct Animation_Struct {
 /*04*/
 };
 
-// solar: this is what causes the caster to animate and the target to
+// this is what causes the caster to animate and the target to
 // get the particle effects around them when a spell is cast
 // also causes a buff icon
 struct Action_Struct
@@ -1224,7 +1224,7 @@ struct ActionAlt_Struct // ActionAlt_Struct - Size: 56 bytes
 /*0056*/
 };
 
-// solar: this is what prints the You have been struck. and the regular
+// this is what prints the You have been struck. and the regular
 // melee messages like You try to pierce, etc.  It's basically the melee
 // and spell damage message
 struct CombatDamage_Struct
@@ -1768,7 +1768,7 @@ struct RandomReq_Struct {
 	uint32 high;
 };
 
-/* solar: 9/23/03 reply to /random command; struct from Zaphod */
+/* 9/23/03 reply to /random command */
 struct RandomReply_Struct {
 /* 00 */	uint32 low;
 /* 04 */	uint32 high;

common/patches/titanium_structs.h

@@ -438,7 +438,7 @@ struct SpawnAppearance_Struct
 };
 
 
-// solar: this is used inside profile
+// this is used inside profile
 struct SpellBuff_Struct
 {
 /*000*/	uint8	slotid;		//badly named... seems to be 2 for a real buff, 0 otherwise
@@ -1054,7 +1054,7 @@ struct Animation_Struct {
 /*04*/
 };
 
-// solar: this is what causes the caster to animate and the target to
+// this is what causes the caster to animate and the target to
 // get the particle effects around them when a spell is cast
 // also causes a buff icon
 struct Action_Struct
@@ -1078,7 +1078,7 @@ struct Action_Struct
  /* 31 */
 };
 
-// solar: this is what prints the You have been struck. and the regular
+// this is what prints the You have been struck. and the regular
 // melee messages like You try to pierce, etc.  It's basically the melee
 // and spell damage message
 struct CombatDamage_Struct
@@ -1516,7 +1516,7 @@ struct RandomReq_Struct {
 	uint32 high;
 };
 
-/* solar: 9/23/03 reply to /random command; struct from Zaphod */
+/* 9/23/03 reply to /random command */
 struct RandomReply_Struct {
 /* 00 */	uint32 low;
 /* 04 */	uint32 high;

common/patches/uf_structs.h

@@ -1250,7 +1250,7 @@ struct Animation_Struct {
 /*04*/
 };
 
-// solar: this is what causes the caster to animate and the target to
+// this is what causes the caster to animate and the target to
 // get the particle effects around them when a spell is cast
 // also causes a buff icon
 struct Action_Struct
@@ -1305,7 +1305,7 @@ struct ActionAlt_Struct
 /*64*/
 };
 
-// solar: this is what prints the You have been struck. and the regular
+// this is what prints the You have been struck. and the regular
 // melee messages like You try to pierce, etc.  It's basically the melee
 // and spell damage message
 struct CombatDamage_Struct
@@ -1849,7 +1849,7 @@ struct RandomReq_Struct {
 	uint32 high;
 };
 
-/* solar: 9/23/03 reply to /random command; struct from Zaphod */
+/* 9/23/03 reply to /random command */
 struct RandomReply_Struct {
 /* 00 */	uint32 low;
 /* 04 */	uint32 high;

common/shareddb.cpp

@@ -438,30 +438,29 @@ bool SharedDatabase::GetSharedBank(uint32 id, Inventory *inv, bool is_charid)
 			}
 		}
 
-		if (!row[9])
-			continue;
+		if (row[9]) {
+			std::string data_str(row[9]);
+			std::string idAsString;
+			std::string value;
+			bool use_id = true;
 
-		std::string data_str(row[9]);
-		std::string idAsString;
-		std::string value;
-		bool use_id = true;
-
-		for (int i = 0; i < data_str.length(); ++i) {
-			if (data_str[i] == '^') {
-				if (!use_id) {
-					inst->SetCustomData(idAsString, value);
-					idAsString.clear();
-					value.clear();
+			for (int i = 0; i < data_str.length(); ++i) {
+				if (data_str[i] == '^') {
+					if (!use_id) {
+						inst->SetCustomData(idAsString, value);
+						idAsString.clear();
+						value.clear();
+					}
+					use_id = !use_id;
+					continue;
 				}
-				use_id = !use_id;
-				continue;
-			}
 
-			char v = data_str[i];
-			if (use_id)
-				idAsString.push_back(v);
-			else
-				value.push_back(v);
+				char v = data_str[i];
+				if (use_id)
+					idAsString.push_back(v);
+				else
+					value.push_back(v);
+			}
 		}
 
 		put_slot_id = inv->PutItem(slot_id, *inst);

common/spdat.cpp

@@ -19,7 +19,7 @@
 
 /*
 
-	solar:	General outline of spell casting process
+	General outline of spell casting process
 
 	1.
 		a)	Client clicks a spell bar gem, ability, or item. client_process.cpp

common/spdat.h

@@ -618,7 +618,7 @@ typedef enum {
 
 #define DF_Permanent			50
 
-// solar: note this struct is historical, we don't actually need it to be
+// note this struct is historical, we don't actually need it to be
 // aligned to anything, but for maintaining it it is kept in the order that
 // the fields in the text file are. the numbering is not offset, but field
 // number. note that the id field is counted as 0, this way the numbers

common/string_util.cpp

@@ -256,7 +256,7 @@ bool atobool(const char* iBool) {
 	return false;
 }
 
-// solar: removes the crap and turns the underscores into spaces.
+// removes the crap and turns the underscores into spaces.
 char *CleanMobName(const char *in, char *out)
 {
 	unsigned i, j;