Merge from master terrible

2026-06-01 06:01:38 +00:00 · 2013-05-15 16:01:13 -07:00
parent 6887ae18ae 312100e1c6
commit b26df187e6
609 changed files with 37214 additions and 37933 deletions
@@ -82,4 +82,3 @@ MARK_AS_ADVANCED(
 	MySQL_LIBRARY_RELEASE
 	MySQL_INCLUDE_DIR
 	)
@@ -124,24 +124,3 @@ void DumpPacketBin(const BasePacket* app) {
 	DumpPacketBin(app->pBuffer, app->size);
 }
@@ -89,5 +89,3 @@ extern void DumpPacketBin(const BasePacket* app);
 #endif /*BASEPACKET_H_*/
@@ -12,3 +12,4 @@ uint16 CRC16(const unsigned char *buf, int size, int key)
 	crc = CRC32::Update(buf, size, crc);
 	return CRC32::Finish(crc) & 0xffff;
 }
@@ -73,6 +73,3 @@ Const_char *EQDB::escape_string(Const_char *from) {
 	return(m_escapeBuffer.c_str());
 }
@@ -49,3 +49,4 @@ map<string,string> EQDBRes::fetch_row_hash() {
 	return rowhash;
 }
@@ -446,27 +446,3 @@ void EQEmuConfig::Dump() const
 //	cout << "DynamicCount = " << DynamicCount << endl;
 }
@@ -422,7 +422,7 @@ if(NextSequencedSend > SequencedQueue.size()) {
 #endif
 					uint16 sqsize = SequencedQueue.size();
 					uint16 index = seq - SequencedBase;
-					_log(NET__NET_TRACE, _L "         OP_OutOfOrderAck marking packet acked in queue (queue index = %d, queue size = %d)." __L, index, sqsize);
+					_log(NET__NET_TRACE, _L "OP_OutOfOrderAck marking packet acked in queue (queue index = %d, queue size = %d)." __L, index, sqsize);
 					if (index < sqsize) {
 						deque<EQProtocolPacket *>::iterator sitr;
 						sitr = SequencedQueue.begin();
@@ -1448,6 +1448,3 @@ EQStream::MatchState EQStream::CheckSignature(const Signature *sig) {
 	return(res);
 }
@@ -277,5 +277,5 @@ class EQStream : public EQStreamInterface {
 };
 #endif
@@ -314,7 +314,6 @@ Timer DecayTimer(20);
 			(*cur)->ReleaseFromUse();
 		}
 		Sleep(10);
 		MStreams.lock();
@@ -328,20 +327,3 @@ Timer DecayTimer(20);
 	}
 }
@@ -1,4 +1,3 @@
 #include "debug.h"
 #include "EQStreamIdent.h"
 #include "EQStreamProxy.h"
@@ -163,37 +162,3 @@ EQStreamIdentifier::Record::Record(EQStream *s)
 {
 }
@@ -170,6 +170,4 @@ protected:
 	map<const EQStreamInfo, T *> streams;
 };
 #endif
@@ -42,14 +42,5 @@ protected:
 	OpcodeManager **const			m_opcodes;	//we do not own this object.
 };
 #endif /*EQSTREAMPROXY_H_*/
@@ -17,31 +17,11 @@
 */
 /*
- * 
+There are really two or three different objects shoe-hored into this
- * 
+connection object. Sombody really needs to factor out the relay link
- * 
+crap into its own subclass of this object, it will clean things up
- * 
+tremendously.
- * There are really two or three different objects shoe-hored into this
+*/
 * connection object. Sombody really needs to factor out the relay link
 * crap into its own subclass of this object, it will clean things up 
 * tremendously.
 * 
 * 
 * 
 * 
 * 
 * 
 * 
 * 
 * 
 * 
 * 
 * 
 * 
 * 
 * 
 * 
 */
 #include "../common/debug.h"
@@ -141,7 +121,6 @@ EmuTCPConnection::~EmuTCPConnection() {
 	//the queues free their content right now I believe.
 }
 EmuTCPNetPacket_Struct* EmuTCPConnection::MakePacket(ServerPacket* pack, uint32 iDestination) {
 	int32 size = sizeof(EmuTCPNetPacket_Struct) + pack->size;
 	if (pack->compressed) {
@@ -473,7 +452,6 @@ void EmuTCPConnection::ClearBuffers() {
 	timeout_timer.Start();
 }
 void EmuTCPConnection::SendNetErrorPacket(const char* reason) {
 	#if TCPC_DEBUG >= 1
 		struct in_addr	in;
@@ -842,14 +820,3 @@ bool EmuTCPConnection::RecvData(char* errbuf) {
 	return(true);
 }
@@ -1,7 +1,3 @@
 #include "debug.h"
 #include "EmuTCPServer.h"
 #include "EmuTCPConnection.h"
@@ -83,14 +79,3 @@ EmuTCPConnection *EmuTCPServer::FindConnection(uint32 iID) {
 	return(nullptr);
 }
@@ -644,8 +644,7 @@ uint8 MaxSkillTable(uint16 skillid, uint16 race, uint16 eqclass, uint16 level) {
 				case MONK: case MONKGM:{
 				// 1 252 252
 					r_value = level*7; // This can't be right can it?
-					break
+					break;
 ;
 				}
 				case WARRIOR: case WARRIORGM:
 				case ROGUE: case ROGUEGM: {
@@ -1894,7 +1893,7 @@ uint8 MaxSkillTable(uint16 skillid, uint16 race, uint16 eqclass, uint16 level) {
 			break;
 		}
 	} // end switch (skillid)
-  // NO skill may go over 252
+// NO skill may go over 252
 	if (r_value > 252)
 		r_value = 252;
 	return r_value;
@@ -52,7 +52,7 @@ using namespace std;
 #ifdef FREEBSD //Timothy Whitman - January 7, 2003
 	#include <sys/socket.h>
 	#include <netinet/in.h>
- #endif
+#endif
 	#include <sys/stat.h>
 	#include <unistd.h>
 	#include <netdb.h>
@@ -89,7 +89,7 @@
 //////////////////////////////////////////////////////////////////////
 //
 // MakeUpperString
-//   i     : source - allocated null-terminated string
+//	i: source - allocated null-terminated string
 //	return: pointer to static buffer with the target string
 const char *MakeUpperString(const char *source);
 const char *MakeLowerString(const char *source);
@@ -352,17 +352,3 @@ ProcLauncher::Spec &ProcLauncher::Spec::operator=(const Spec &other) {
 	return(*this);
 }
@@ -65,25 +65,18 @@ public:
 		virtual void OnTerminate(const ProcRef &ref, const Spec *spec) = 0;
 	};
-	/*
+	/* The main launch method, call to start a new background process. */
 	 * The main launch method, call to start a new background process.
 	 */
 	ProcRef Launch(Spec *&to_launch);	//takes ownership of the pointer
-	/*
+	/* The terminate method */
 	 * The terminate method
 	 */
 	bool Terminate(const ProcRef &proc, bool graceful = true);
 	void TerminateAll(bool final = true);
-	/*
+	/* The main processing method. Call regularly to check for terminated background processes. */
 	 * The main processing method. Call regularly to check for terminated
 	 * background processes.
 	 */
 	void Process();
 protected:
-//	std::vector<Spec *> m_specs;
+	//std::vector<Spec *> m_specs;
 	std::map<ProcRef, Spec *> m_running;	//we own the pointers in this map
 	void ProcessTerminated(std::map<ProcRef, Spec *>::iterator &it);
@@ -96,29 +89,5 @@ private:
 #endif
 };
 #endif /*PROCLAUNCHER_H_*/
@@ -439,7 +439,7 @@ bool TCPConnection::ConnectIP(uint32 in_ip, uint16 in_port, char* errbuf) {
 	connection_socket = INVALID_SOCKET;
 	struct sockaddr_in	server_sin;
-//    struct in_addr	in;
+	//struct in_addr	in;
 	if ((connection_socket = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET || connection_socket == 0) {
 #ifdef _WINDOWS
@@ -943,7 +943,3 @@ bool TCPConnection::RunLoop() {
 	return ret;
 }
@@ -177,5 +177,3 @@ private:
 #endif
@@ -1,5 +1,3 @@
 #include "debug.h"
 #include "TCPServer.h"
 #include <stdio.h>
@@ -18,12 +16,8 @@
 	#define SOCKET_ERROR -1
 #endif
 #define SERVER_LOOP_GRANULARITY 3	//# of ms between checking our socket/queues
 BaseTCPServer::BaseTCPServer(uint16 in_port) {
 	NextID = 1;
 	pPort = in_port;
@@ -230,4 +224,3 @@ bool BaseTCPServer::IsOpen() {
 	return ret;
 }
@@ -29,8 +29,8 @@ using namespace std;
 /*
- * See note in XMLParser::ParseFile() before inheriting this class.
+* See note in XMLParser::ParseFile() before inheriting this class.
- */
+*/
 class XMLParser {
 public:
 	typedef void (XMLParser::*ElementHandler)(TiXmlElement *ele);
@@ -54,6 +54,3 @@ protected:
 #endif
@@ -45,7 +45,7 @@ typedef enum {
 	BT_Dragon			= 26,
 	BT_Summoned2		= 27,
 	BT_Summoned3		= 28,
-	//					  29
+						//29
 	BT_VeliousDragon	= 30,	//might not be a tight set
 	//					...
 	BT_Dragon3			= 32,
@@ -1,5 +1,3 @@
 // Doors
 #ifdef SHAREMEM
 int32 Database::GetDoorsCount(uint32* oMaxID) {
@@ -437,5 +437,3 @@ void EQEMuLog::SetAllCallbacks(msgCallbackPva proc) {
 	}
 }
@@ -1,19 +1,19 @@
 /*	EQEMu: Everquest Server Emulator
-Copyright (C) 2001-2005  EQEMu Development Team (http://eqemulator.net)
+	Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net)
-This program is free software; you can redistribute it and/or modify
+	This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
+	it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+	the Free Software Foundation; version 2 of the License.
-This program is distributed in the hope that it will be useful,
+	This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY except by those people which sell it, which
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
-are required to give you total support for your newly bought product;
+	are required to give you total support for your newly bought product;
-without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
+	You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+	along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  04111-1307  USA
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 04111-1307 USA
 */
 #include "debug.h"
@@ -49,5 +49,3 @@ extern const char *OpcodeNames[_maxEmuOpcode+1];
 #endif
@@ -435,11 +435,11 @@ typedef enum {
 #define STAT_HASTE		19
 #define STAT_DAMAGE_SHIELD	20
-  /** 
+/**
-    * Recast timer types. Used as an off set to charProfileStruct timers. 
+* Recast timer types. Used as an off set to charProfileStruct timers.
-    */ 
+*/
-   enum RecastTypes 
+enum RecastTypes
-   { 
+{
 	RecastTimer0 = 0,
 	RecastTimer1,
 	WeaponHealClickTimer, // 2
@@ -460,9 +460,9 @@ typedef enum {
 	RecastTimer17,
 	RecastTimer18,
 	ModRodTimer // 19
-   };
+};
-   enum GroupUpdateAction
+enum GroupUpdateAction
 {
 	GUA_Joined = 0,
 	GUA_Left = 1,
@@ -224,19 +224,19 @@ struct Spawn_Struct {
 /*0087*/ uint8	max_hp;				// (name prolly wrong)takes on the value 100 for players, 100 or 110 for NPCs and 120 for PC corpses...
 /*0088*/ uint8	findable;			// 0=can't be found, 1=can be found
 /*0089*/ uint8	unknown0089[5];
-/*0094*/ signed   deltaHeading:10;// change in heading
+/*0094*/ signed	deltaHeading:10;	// change in heading
-         signed   x:19;           // x coord
+/*????*/ signed	x:19;				// x coord
-         signed   padding0054:3;  // ***Placeholder
+/*????*/ signed	padding0054:3;		// ***Placeholder
 /*0098*/ signed	y:19;				// y coord
-         signed   animation:10;   // animation
+/*????*/ signed	animation:10;		// animation
-         signed   padding0058:3;  // ***Placeholder
+/*????*/ signed	padding0058:3;		// ***Placeholder
 /*0102*/ signed	z:19;				// z coord
-         signed   deltaY:13;      // change in y
+/*????*/ signed	deltaY:13;			// change in y
 /*0106*/ signed	deltaX:13;			// change in x
-         unsigned heading:12;     // heading
+/*????*/ unsigned	heading:12;		// heading
-         signed   padding0066:7;  // ***Placeholder
+/*????*/ signed	padding0066:7;		// ***Placeholder
 /*0110*/ signed	deltaZ:13;			// change in z
-         signed   padding0070:19; // ***Placeholder
+/*????*/ signed	padding0070:19;		// ***Placeholder
 /*0114*/ uint8	eyecolor1;			// Player's left eye color
 /*0115*/ uint8	unknown0115[11];	// Was [24]
 /*0126*/ uint8	StandState;	// stand state for SoF+ 0x64 for normal animation
@@ -1119,8 +1119,7 @@ struct SpecialMesg_Struct
 };
 /*
-** When somebody changes what they're wearing
+** When somebody changes what they're wearing or give a pet a weapon (model changes)
 **      or give a pet a weapon (model changes)
 ** Length: 19 Bytes
 */
 struct WearChange_Struct{
@@ -1321,8 +1320,7 @@ struct SpawnPositionUpdate_Struct
 /*0000*/ uint16		spawn_id;
 /*0002*/ uint64		y_pos:19, z_pos:19, x_pos:19, padding002:7;
 /*0010*/ unsigned	heading:12;
-         signed padding010:4;
+/*0012*/ signed		padding010:4;
 /*0012*/
 };
 /*
@@ -1665,7 +1663,7 @@ struct GMGoto_Struct { // x,y is swapped as compared to summon and makes sense a
 /*  0*/ char	charname[64];
 /* 64*/ char	gmname[64];
-/* 128*/ uint32	success;
+/* 128*/uint32	success;
 /* 132*/ uint32	zoneID;
 /*136*/ int32	y;
@@ -2457,7 +2455,7 @@ struct Shielding_Struct {
 /*
 ** Click Object Action Struct
 ** Response to client clicking on a World Container (ie, forge)
-*  also sent by the client when they close the container.
+** also sent by the client when they close the container.
 **
 */
 struct ClickObjectAction_Struct {
@@ -3816,14 +3814,14 @@ struct BankerChange_Struct {
 };
 struct LeadershipExpUpdate_Struct {
-   /*0000*/ uint32 unknown0000;          // All zeroes?
+/*0000*/ uint32 unknown0000;				// All zeroes?
-   /*0004*/ uint32 group_leadership_exp;         // Group leadership exp value
+/*0004*/ uint32 group_leadership_exp;		// Group leadership exp value
-   /*0008*/ uint32 group_leadership_points;   // Unspent group points
+/*0008*/ uint32 group_leadership_points;	// Unspent group points
-   /*0012*/ uint32 unknown0012;          // Type?
+/*0012*/ uint32 unknown0012;				// Type?
-   /*0016*/ uint32 unknown0016;          // All zeroes?
+/*0016*/ uint32 unknown0016;				// All zeroes?
-   /*0020*/ uint32 raid_leadership_exp;          // Raid leadership exp value
+/*0020*/ uint32 raid_leadership_exp;		// Raid leadership exp value
-   /*0024*/ uint32 raid_leadership_points;    // Unspent raid points
+/*0024*/ uint32 raid_leadership_points;		// Unspent raid points
-   /*0028*/ uint32 unknown0028;
+/*0028*/ uint32 unknown0028;
 };
 struct UpdateLeadershipAA_Struct {
@@ -5080,3 +5078,4 @@ typedef std::list<ServerLootItem_Struct*> ItemList;
 #pragma pack()
 #endif
@@ -273,8 +273,3 @@ void EQTime::ToString(TimeOfDay_Struct *t, string &str) {
 	str = buf;
 }
@@ -50,8 +50,3 @@ bool SetExtendedProfile(ExtendedProfile_Struct *to, char *old, unsigned int len)
 	return(false);
 }
@@ -249,3 +249,4 @@ namespace EQEmu {
 } // EQEmu
 #endif
@@ -1,19 +1,19 @@
 /*	EQEMu: Everquest Server Emulator
-Copyright (C) 2001-2003  EQEMu Development Team (http://eqemulator.net)
+	Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net)
-This program is free software; you can redistribute it and/or modify
+	This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
+	it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+	the Free Software Foundation; version 2 of the License.
-This program is distributed in the hope that it will be useful,
+	This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY except by those people which sell it, which
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
-are required to give you total support for your newly bought product;
+	are required to give you total support for your newly bought product;
-without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
+	You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+	along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  04111-1307  USA
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 04111-1307 USA
 */
 #ifndef ITEM_STRUCT_H
@@ -191,10 +191,10 @@ void LinkedListIterator<TYPE>::MoveFirst()
 		return;
 	}
-//  if (prev != 0)
+	//if (prev != 0)
-//  {
+	//{
 		prev->SetNext(next);
-//  }
+	//}
 	if (next != 0)
 	{
 		next->SetPrev(prev);
@@ -225,10 +225,10 @@ void LinkedListIterator<TYPE>::MoveLast()
 	{
 		list.first = next;
 	}
-//  if (next != 0)
+	//if (next != 0)
-//  {
+	//{
 		next->SetPrev(prev);
-//  }
+	//}
 	current_element->SetNext(0);
 	current_element->SetPrev(next->GetLast());
 	next->GetLast()->SetNext(current_element);
@@ -155,6 +155,3 @@ bool load_log_settings(const char *filename) {
 	return(true);
 }
@@ -19,28 +19,22 @@
 #define LOGSYS_H_
 /*
- * 
+*
- * Usage:
+* Usage:
- * 
+*
- * 	These are the main functions provided by logsys:
+*	These are the main functions provided by logsys:
- * 		- _log(TYPE, fmt, ...) - Log a message in any context
+*		- _log(TYPE, fmt, ...) - Log a message in any context
- * 		- mlog(TYPE, fmt, ...) - Zone only. Log a message from a Mob:: context, prefixing it with the mob's name.
+*		- mlog(TYPE, fmt, ...) - Zone only. Log a message from a Mob:: context, prefixing it with the mob's name.
- * 		- clog(TYPE, fmt, ...) - World only. Log a message from a Client:: context, prefixing it with the client's account name.
+*		- clog(TYPE, fmt, ...) - World only. Log a message from a Client:: context, prefixing it with the client's account name.
- * 		- zlog(TYPE, fmt, ...) - World only. Log a message from a ZoneServer:: context, prefixing it with the zones id/name or ip/port.
+*		- zlog(TYPE, fmt, ...) - World only. Log a message from a ZoneServer:: context, prefixing it with the zones id/name or ip/port.
- * 		- _hex(TYPE, data, length) - Log hex dump in any context.
+*		- _hex(TYPE, data, length) - Log hex dump in any context.
- * 		- mhex(TYPE, data, length) - Zone only. Log a hex dump from a Mob:: context, prefixing it with the mob's name
+*		- mhex(TYPE, data, length) - Zone only. Log a hex dump from a Mob:: context, prefixing it with the mob's name
- * 		- _pkt(TYPE, BasePacket *) - Log a packet hex dump with header in any context.
+*		- _pkt(TYPE, BasePacket *) - Log a packet hex dump with header in any context.
- * 		- mhex(TYPE, data, length) - Zone only. Log a packet hex dump from a Mob:: context, prefixing it with the mob's name
+*		- mhex(TYPE, data, length) - Zone only. Log a packet hex dump from a Mob:: context, prefixing it with the mob's name
- * Types are defined in logtypes.h
+* Types are defined in logtypes.h
- * 
+*
- * 
+* this is very C-ish, not C++ish, but thats how I felt like writting it
- * 
+*/
 * 
 * this is very C-ish, not C++ish, but thats how I felt like writting it
 * 
 * 
 * 
 */
 #include <stdarg.h>
 #include "types.h"
@@ -175,13 +169,5 @@ extern void log_toggle(LogType t);
 extern bool load_log_settings(const char *filename);
 #endif /*LOGSYS_H_*/
@@ -37,7 +37,3 @@ void log_messageVA(LogType type, const char *fmt, va_list args) {
 	LogFile->writePVA(EQEMuLog::Debug, prefix_buffer, fmt, args);
 }
@@ -16,8 +16,6 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 #ifndef LOG_CATEGORY
 #define LOG_CATEGORY(name)
 #endif
@@ -32,8 +30,6 @@
 #endif
 LOG_CATEGORY( CHAT )
 LOG_TYPE( CHAT, SAY, DISABLED )
 LOG_TYPE( CHAT, EMOTE, DISABLED )
@@ -260,6 +256,3 @@ LOG_TYPE( WORLD, LAUNCH_TRACE, ENABLED )
 #undef LOG_TYPE
 #undef LOG_CATEGORY
@@ -267,5 +267,9 @@ void MD5::Transform(uint32 hash[4], const uint32 input[16]) {
 	MD5STEP(F4, c, d, a, b, input[ 2]+0x2ad7d2bb, 15);
 	MD5STEP(F4, b, c, d, a, input[ 9]+0xeb86d391, 21);
-   hash[0] += a;   hash[1] += b;   hash[2] += c;   hash[3] += d;
+	hash[0] += a;
 	hash[1] += b;
 	hash[2] += c;
 	hash[3] += d;
 }
@@ -41,3 +41,4 @@ void build_hex_line(const char *buffer, unsigned long length, unsigned long offs
 void print_hex(const char *buffer, unsigned long length);
 #endif
@@ -180,7 +180,6 @@ bool RegularOpcodeManager::ReloadOpcodes(const char *filename, bool report_error
 	return(ret);
 }
 uint16 RegularOpcodeManager::EmuToEQ(const EmuOpcode emu_op) {
 	//opcode is checked for validity in GetEQOpcode
 	uint16 res;
@@ -221,7 +220,6 @@ void RegularOpcodeManager::SetOpcode(EmuOpcode emu_op, uint16 eq_op) {
 	s.Set(emu_op, eq_op);
 }
 void RegularOpcodeManager::NormalMemStrategy::Set(EmuOpcode emu_op, uint16 eq_op) {
 	if(uint32(emu_op) >= it->EmuOpcodeCount || eq_op >= it->EQOpcodeCount)
 		return;
@@ -233,7 +231,6 @@ NullOpcodeManager::NullOpcodeManager()
 : MutableOpcodeManager() {
 }
 bool NullOpcodeManager::LoadOpcodes(const char *filename, bool report_errors) {
 	return(true);
 }
@@ -254,7 +251,6 @@ EmptyOpcodeManager::EmptyOpcodeManager()
 : MutableOpcodeManager() {
 }
 bool EmptyOpcodeManager::LoadOpcodes(const char *filename, bool report_errors) {
 	return(true);
 }
@@ -280,9 +276,3 @@ void EmptyOpcodeManager::SetOpcode(EmuOpcode emu_op, uint16 eq_op) {
 	eq_to_emu[eq_op] = emu_op;
 }
@@ -162,15 +162,3 @@ protected:
 #endif
@@ -193,3 +193,4 @@ void DumpPacketBin(const void* iData, uint32 len) {
 		cout << " " << hex << setw(2) << setfill('0') << (int) data[k-1] << dec;
 	cout << endl;
 }
@@ -33,3 +33,4 @@ void DumpPacketBin(uint16 data);
 void DumpPacketBin(uint8 data);
 #endif
@@ -1200,7 +1200,7 @@ ENCODE(OP_ZoneSpawns) {
 			Buffer += sizeof(structs::Spawn_Struct_Position);
-			if((emu->NPC == 0) || (emu->race <=12) || (emu->race == 128) || (emu->race == 130) || (emu->race == 330) || (emu->race == 522))
+			if((emu->NPC == 0) || (emu->race <=12) || (emu->race == 128) || (emu ->race == 130) || (emu->race == 330) || (emu->race == 522))
 			{
 				for(k = 0; k < 9; ++k)
 				{
@@ -1212,7 +1212,7 @@ ENCODE(OP_ZoneSpawns) {
 			Buffer += sizeof(structs::Spawn_Struct_Position);
-			if((emu->NPC == 0) || (emu->race <=12) || (emu->race == 128) || (emu->race == 130) || (emu->race == 330) || (emu->race == 522))
+			if((emu->NPC == 0) || (emu->race <=12) || (emu->race == 128) || (emu ->race == 130) || (emu->race == 330) || (emu->race == 522))
 			{
 				for(k = 0; k < 9; ++k)
 				{
@@ -1,10 +1,10 @@
 /*
- * This file was generated automatically by xsubpp version 1.9508 from the
+* This file was generated automatically by xsubpp version 1.9508 from the
- * contents of tmp. Do not edit this file, edit tmp instead.
+* contents of tmp. Do not edit this file, edit tmp instead.
- *
+*
- *		ANY CHANGES MADE HERE WILL BE LOST!
+*		ANY CHANGES MADE HERE WILL BE LOST!
- *
+*
- */
+*/
 /*	EQEMu: Everquest Server Emulator
@@ -1,10 +1,10 @@
 /*
- * This file was generated automatically by xsubpp version 1.9508 from the
+* This file was generated automatically by xsubpp version 1.9508 from the
- * contents of tmp. Do not edit this file, edit tmp instead.
+* contents of tmp. Do not edit this file, edit tmp instead.
- *
+*
- *		ANY CHANGES MADE HERE WILL BE LOST!
+*		ANY CHANGES MADE HERE WILL BE LOST!
- *
+*
- */
+*/
 /*	EQEMu: Everquest Server Emulator
@@ -9,3 +9,4 @@ void RegisterExecutablePlatform(EQEmuExePlatform p) {
 const EQEmuExePlatform& GetExecutablePlatform() {
 	return exe_platform;
 }
@@ -508,9 +508,7 @@ $races_table = array(
 		402 => "Invader Soldier Elite",
 		403 => "UNKNOWN RACE",
 		404 => "Discord Ship",
 */
 #endif
@@ -166,7 +166,3 @@ void RDTSC_Collector::reset() {
 	_count = 0;
 }
@@ -83,5 +83,4 @@ protected:
 	int64 _count;
 };
 #endif
@@ -54,18 +54,15 @@ CREATE TABLE rule_values (
 Commands:
 #rules:
- - current -> lists current set name
+	current -> lists current set name
- - switch (set name) -> change set in the DB, but dont reload
+	switch (set name) -> change set in the DB, but dont reload
- - load (set name) -> load set into this zone without changing the world
+	load (set name) -> load set into this zone without changing the world
- - wload (set name) -> tell world and all zones to load this rule set
+	wload (set name) -> tell world and all zones to load this rule set
- - store [set name] -> store the current rules in this zone to the set (or
+	store [set name] -> store the current rules in this zone to the set (or active if not specified)
-       active if not specified)
+	reset -> reset all rule values to their defaults.
- - reset -> reset all rule values to their defaults.
+	list [catname]
- - list [catname]
+	set (cat) (rule) (value)
- - set (cat) (rule) (value)
+	values [catname] -> show the values of all rules in the specified category/
 - values [catname] -> show the values of all rules in the specified category/
 */
 const char *RuleManager::s_categoryNames[_CatCount+1] = {
@@ -458,35 +455,3 @@ bool RuleManager::GetBoolRule(RuleManager::BoolType t) const
 	return (m_RuleBoolValues[t] == 1);
 }
@@ -152,3 +152,4 @@ private:
 };
 #endif /*RULESYS_H_*/
@@ -1,4 +1,3 @@
 #include "shareddb.h"
 #include <iostream>
 #include <cstring>
@@ -1166,7 +1165,7 @@ void SharedDatabase::LoadNPCFactionLists(void *data, uint32 size, uint32 list_co
 		mysql_free_result(result);
 	} else {
 		LogFile->write(EQEMuLog::Error, "Error getting npc faction info from database: %s, %s", query, errbuf);
-    }
+}
 }
 bool SharedDatabase::LoadNPCFactionLists() {
@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-Copyright (C) 2001-2002  EQEMu Development Team (http://eqemu.org)
+	Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org)
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -192,3 +192,4 @@ const uint32 Timer::SetCurrentTime()
 //	cerr << "Current time:" << current_time << endl;
 	return current_time;
 }
@@ -110,6 +110,4 @@ typedef const char Const_char;	//for perl XS
 #define DLLFUNC extern "C"
 #endif
 #endif
@@ -46,4 +46,3 @@ char* strlwr(char* tmp) {
 	int joe = 1;
 #endif /* !WIN32 */
@@ -32,3 +32,4 @@ char* strlwr(char* tmp);
 #endif
 #endif
 #endif
@@ -48,3 +48,4 @@ extern "C" {	//the perl headers dont do this for us...
 #endif /*EMU_PERL_H_*/
@@ -94,8 +94,3 @@ void WorldConnection::Disconnect() {
 	tcpc.Disconnect();
 }
@@ -34,7 +34,7 @@ void ZoneLaunch::InitStartTimer() {
 }
 ZoneLaunch::ZoneLaunch(WorldServer *world, const char *launcher_name,
-	const char *zone_name, const EQEmuConfig *config)
+const char *zone_name, const EQEmuConfig *config)
 : m_state(StateStartPending),
 	m_world(world),
 	m_zone(zone_name),
@@ -250,38 +250,3 @@ void ZoneLaunch::OnTerminate(const ProcLauncher::ProcRef &ref, const ProcLaunche
 	SendStatus();
 }
@@ -75,13 +75,4 @@ private:
 	static Timer s_startTimer;
 };
 #endif /*ZONELAUNCH_H_*/
@@ -49,9 +49,9 @@ enum LoginMode
 };
 /**
- * Client class, controls a single client and it's 
+* Client class, controls a single client and it's
- * connection to the login server.
+* connection to the login server.
- */
+*/
 class Client
 {
 public:
@@ -28,8 +28,8 @@
 using namespace std;
 /**
- * Client manager class, holds all the client objects and does basic processing.
+* Client manager class, holds all the client objects and does basic processing.
- */
+*/
 class ClientManager
 {
 public:
@@ -21,10 +21,10 @@
 extern ErrorLog *server_log;
 /**
- * Retrieves the variable we want from our title or theme
+* Retrieves the variable we want from our title or theme
- * First gets the map from the title
+* First gets the map from the title
- * Then gets the argument from the map we got from title
+* Then gets the argument from the map we got from title
- */
+*/
 string Config::GetVariable(string title, string parameter)
 {
 	map<string, map<string, string> >::iterator iter = vars.find(title);
@@ -41,9 +41,9 @@ string Config::GetVariable(string title, string parameter)
 }
 /**
- * Opens a file and passes it to the tokenizer
+* Opens a file and passes it to the tokenizer
- * Then it parses the tokens returned and puts them into titles and variables.
+* Then it parses the tokens returned and puts them into titles and variables.
- */
+*/
 void Config::Parse(const char *file_name)
 {
 	if(file_name == nullptr)
@@ -138,10 +138,10 @@ void Config::Parse(const char *file_name)
 }
 /**
- * Pretty basic lexical analyzer
+* Pretty basic lexical analyzer
- * Breaks up the input character stream into tokens and puts them into the list provided.
+* Breaks up the input character stream into tokens and puts them into the list provided.
- * Ignores # as a line comment
+* Ignores # as a line comment
- */
+*/
 void Config::Tokenize(FILE *input, list<string> &tokens)
 {
 	char c = fgetc(input);
@@ -26,8 +26,8 @@ using namespace std;
 //#define EQEMU_POSTGRESQL_ENABLED
 /**
- * Base database class, intended to be extended.
+* Base database class, intended to be extended.
- */
+*/
 class Database
 {
 public:
@@ -29,8 +29,8 @@
 using namespace std;
 /**
- * Mysql Database class
+* Mysql Database class
- */
+*/
 class DatabaseMySQL : public Database
 {
 public:
@@ -23,3 +23,4 @@ char* Encrypt(const char* buffer, unsigned int bufferSize, unsigned int &outSize
 void _HeapDeleteCharBuffer(char *buffer);
 #endif
@@ -29,9 +29,9 @@ typedef char*(*DLLFUNC_Encrypt)(const char*, unsigned int, unsigned int&);
 typedef void(*DLLFUNC_HeapDelete)(char*);
 /**
- * Basic windows encryption plugin.
+* Basic windows encryption plugin.
- * Handles the managment of the plugin.
+* Handles the managment of the plugin.
- */
+*/
 class Encryption
 {
 public:
@@ -207,3 +207,4 @@ void ErrorLog::LogPacket(eqLogType type, const char *data, size_t size)
 	log_mutex->unlock();
 }
@@ -29,9 +29,9 @@
 #include "ClientManager.h"
 /**
- * Login server struct, contains every variable for the server that needs to exist 
+* Login server struct, contains every variable for the server that needs to exist
- * outside the scope of main().
+* outside the scope of main().
- */
+*/
 struct LoginServer
 {
 public:
@@ -342,3 +342,4 @@ void ServerManager::DestroyServerByName(string l_name, string s_name, WorldServe
 		iter++;
 	}
 }
@@ -31,8 +31,8 @@
 using namespace std;
 /**
- * Server manager class, deals with management of the world servers.
+* Server manager class, deals with management of the world servers.
- */
+*/
 class ServerManager
 {
 public:
@@ -1,6 +1,4 @@
-/*
+/*	EQEMu: Everquest Server Emulator
 	EQEMu:  Everquest Server Emulator
 	Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net)
 	This program is free software; you can redistribute it and/or modify
@@ -321,3 +319,4 @@ void Database::LogMerchantTransaction(QSMerchantLogTransaction_Struct* QS, uint3
 		}
 	}
 }
@@ -1,6 +1,4 @@
-/*
+/*	EQEMu: Everquest Server Emulator
 	EQEMu:  Everquest Server Emulator
 	Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net)
 	This program is free software; you can redistribute it and/or modify
@@ -61,3 +59,4 @@ private:
 };
 #endif
@@ -433,3 +433,4 @@ void LFGuildManager::SendGuildStatus(uint32 FromZoneID, uint32 FromInstanceID, c
 		}
 	}
 }
@@ -1,6 +1,4 @@
-/*
+/*	EQEMu: Everquest Server Emulator
 	EQEMu:  Everquest Server Emulator
 	Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net)
 	This program is free software; you can redistribute it and/or modify
@@ -1,6 +1,4 @@
-/*
+/*	EQEMu: Everquest Server Emulator
 	EQEMu:  Everquest Server Emulator
 	Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net)
 	This program is free software; you can redistribute it and/or modify
@@ -27,3 +25,4 @@ queryservconfig *queryservconfig::_chat_config = nullptr;
 string queryservconfig::GetByName(const string &var_name) const {
 	return(EQEmuConfig::GetByName(var_name));
 }
@@ -1,6 +1,4 @@
-/*
+/*	EQEMu: Everquest Server Emulator
 	EQEMu:  Everquest Server Emulator
 	Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net)
 	This program is free software; you can redistribute it and/or modify
@@ -54,3 +52,4 @@ public:
 };
 #endif
@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-Copyright (C) 2001-2002  EQEMu Development Team (http://eqemu.org)
+	Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org)
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -23,12 +23,12 @@
 class WorldServer : public WorldConnection
 {
-public:
+	public:
 		WorldServer();
 		virtual ~WorldServer();
 		virtual void Process();
-private:
+	private:
 		virtual void OnConnected();
 };
 #endif
@@ -23,3 +23,4 @@ class SharedDatabase;
 void LoadSkillCaps(SharedDatabase *database);
 #endif
@@ -40,3 +40,4 @@ void LoadSpells(SharedDatabase *database) {
 	database->LoadSpells(ptr, records);
 	mutex.Unlock();
 }
@@ -34,6 +34,7 @@ IF(MINGW)
 ENDIF(MINGW)
 IF(UNIX)
 	IF(NOT FREEBSD)
 		TARGET_LINK_LIBRARIES(ucs "dl")
 	ENDIF(NOT FREEBSD)
@@ -1,6 +1,4 @@
-/*
+/*	EQEMu: Everquest Server Emulator
 	EQEMu:  Everquest Server Emulator
 	Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net)
 	This program is free software; you can redistribute it and/or modify
@@ -704,3 +702,4 @@ string CapitaliseName(string inString) {
 	return NormalisedName;
 }
@@ -1,6 +1,4 @@
-/*
+/*	EQEMu: Everquest Server Emulator
 	EQEMu:  Everquest Server Emulator
 	Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net)
 	This program is free software; you can redistribute it and/or modify
@@ -2407,3 +2405,4 @@ int Client::GetCharID() {
 	return Characters[0].CharID;
 }
@@ -1,6 +1,4 @@
-/*
+/*	EQEMu: Everquest Server Emulator
 	EQEMu:  Everquest Server Emulator
 	Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net)
 	This program is free software; you can redistribute it and/or modify
@@ -32,12 +30,14 @@
 #define MAX_JOINED_CHANNELS 10
-enum { CommandJoin = 0, CommandLeaveAll, CommandLeave, CommandListAll, CommandList, CommandSet, CommandAnnounce, CommandSetOwner,
+enum {
 	CommandJoin = 0, CommandLeaveAll, CommandLeave, CommandListAll, CommandList, CommandSet, CommandAnnounce, CommandSetOwner,
 	CommandOPList, CommandInvite, CommandGrant, CommandModerate, CommandVoice, CommandKick,
 	CommandPassword, CommandToggleInvites, CommandAFK, CommandUptime,
 	CommandGetHeaders, CommandGetBody, CommandMailTo, CommandSetMessageStatus, CommandSelectMailBox,
 	CommandSetMailForwarding, CommandBuddy, CommandIgnorePlayer,
-       CommandEndOfList };
+	CommandEndOfList
 };
 struct CommandEntry {
 	const char *CommandString;
@@ -1,6 +1,4 @@
-/*
+/*	EQEMu: Everquest Server Emulator
 	EQEMu:  Everquest Server Emulator
 	Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net)
 	This program is free software; you can redistribute it and/or modify
@@ -768,3 +766,4 @@ void Database::GetFriendsAndIgnore(int CharID, vector<string> &Friends, vector<s
 	return;
 }
@@ -1,6 +1,4 @@
-/*
+/*	EQEMu: Everquest Server Emulator
 	EQEMu:  Everquest Server Emulator
 	Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net)
 	This program is free software; you can redistribute it and/or modify
@@ -71,3 +69,4 @@ private:
 };
 #endif
@@ -1,6 +1,4 @@
-/*
+/*	EQEMu: Everquest Server Emulator
 	EQEMu:  Everquest Server Emulator
 	Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net)
 	This program is free software; you can redistribute it and/or modify
@@ -1,6 +1,4 @@
-/*
+/*	EQEMu: Everquest Server Emulator
 	EQEMu:  Everquest Server Emulator
 	Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net)
 	This program is free software; you can redistribute it and/or modify
@@ -27,3 +25,4 @@ ucsconfig *ucsconfig::_chat_config = nullptr;
 string ucsconfig::GetByName(const string &var_name) const {
 	return(EQEmuConfig::GetByName(var_name));
 }
@@ -1,6 +1,4 @@
-/*
+/*	EQEMu: Everquest Server Emulator
 	EQEMu:  Everquest Server Emulator
 	Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net)
 	This program is free software; you can redistribute it and/or modify
@@ -54,3 +52,4 @@ public:
 };
 #endif
@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-Copyright (C) 2001-2002  EQEMu Development Team (http://eqemu.org)
+	Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org)
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
--- a/Show More
+++ b/Show More
`@@ -124,24 +124,3 @@ void DumpPacketBin(const BasePacket* app) {`
	`DumpPacketBin(app->pBuffer, app->size);`	`DumpPacketBin(app->pBuffer, app->size);`
	`}`	`}`
`@@ -89,5 +89,3 @@ extern void DumpPacketBin(const BasePacket* app);`

	`#endif /BASEPACKET_H_/`	`#endif /BASEPACKET_H_/`
`@@ -73,6 +73,3 @@ Const_char EQDB::escape_string(Const_char from) {`
	`return(m_escapeBuffer.c_str());`	`return(m_escapeBuffer.c_str());`
	`}`	`}`
`@@ -49,3 +49,4 @@ map<string,string> EQDBRes::fetch_row_hash() {`

	`return rowhash;`	`return rowhash;`
	`}`	`}`
`@@ -446,27 +446,3 @@ void EQEmuConfig::Dump() const`
	`// cout << "DynamicCount = " << DynamicCount << endl;`	`// cout << "DynamicCount = " << DynamicCount << endl;`
	`}`	`}`
`@@ -277,5 +277,5 @@ class EQStream : public EQStreamInterface {`

	`};`	`};`


	`#endif`	`#endif`
`@@ -352,17 +352,3 @@ ProcLauncher::Spec &ProcLauncher::Spec::operator=(const Spec &other) {`
	`return(*this);`	`return(*this);`
	`}`	`}`
`@@ -437,5 +437,3 @@ void EQEMuLog::SetAllCallbacks(msgCallbackPva proc) {`
	`}`	`}`
	`}`	`}`
`@@ -49,5 +49,3 @@ extern const char *OpcodeNames[_maxEmuOpcode+1];`

	`#endif`	`#endif`
`@@ -273,8 +273,3 @@ void EQTime::ToString(TimeOfDay_Struct *t, string &str) {`
	`str = buf;`	`str = buf;`
	`}`	`}`