Merge conflicts

cmake/FindMySQL.cmake

@@ -82,4 +82,3 @@ MARK_AS_ADVANCED(
 	MySQL_LIBRARY_RELEASE
 	MySQL_INCLUDE_DIR
 	)
-  

common/BasePacket.cpp

@@ -124,24 +124,3 @@ void DumpPacketBin(const BasePacket* app) {
 	DumpPacketBin(app->pBuffer, app->size);
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

common/BasePacket.h

@@ -89,5 +89,3 @@ extern void DumpPacketBin(const BasePacket* app);
 
 #endif /*BASEPACKET_H_*/
 
-
-

common/CRC16.cpp

@@ -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;
 }
+

common/EQDB.cpp

@@ -73,6 +73,3 @@ Const_char *EQDB::escape_string(Const_char *from) {
 	return(m_escapeBuffer.c_str());
 }
 
-
-
-

common/EQDBRes.cpp

@@ -49,3 +49,4 @@ map<string,string> EQDBRes::fetch_row_hash() {
 
 	return rowhash;
 }
+

common/EQEmuConfig.cpp

@@ -446,27 +446,3 @@ void EQEmuConfig::Dump() const
 //	cout << "DynamicCount = " << DynamicCount << endl;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

common/EQStream.cpp

@@ -1448,6 +1448,3 @@ EQStream::MatchState EQStream::CheckSignature(const Signature *sig) {
 	return(res);
 }
 
-
-
-

common/EQStream.h

@@ -277,5 +277,5 @@ class EQStream : public EQStreamInterface {
 
 };
 
-
 #endif
+

common/EQStreamFactory.cpp

@@ -314,7 +314,6 @@ Timer DecayTimer(20);
 			(*cur)->ReleaseFromUse();
 		}
 
-
 		Sleep(10);
 
 		MStreams.lock();
@@ -328,20 +327,3 @@ Timer DecayTimer(20);
 	}
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

common/EQStreamIdent.cpp

@@ -1,4 +1,3 @@
-
 #include "debug.h"
 #include "EQStreamIdent.h"
 #include "EQStreamProxy.h"
@@ -163,37 +162,3 @@ EQStreamIdentifier::Record::Record(EQStream *s)
 {
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

common/EQStreamLocator.h

@@ -170,6 +170,4 @@ protected:
 	map<const EQStreamInfo, T *> streams;
 };
 
-
-
 #endif

common/EQStreamProxy.h

@@ -42,14 +42,5 @@ protected:
 	OpcodeManager **const			m_opcodes;	//we do not own this object.
 };
 
-
-
-
-
-
-
-
-
 #endif /*EQSTREAMPROXY_H_*/
 
-

common/EmuTCPConnection.cpp

@@ -17,30 +17,10 @@
 */
 
 /*
- * 
- * 
- * 
- * 
- * 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);
 }
 
-
-
-
-
-
-
-
-
-
-
-

common/EmuTCPServer.cpp

@@ -1,7 +1,3 @@
-
-
-
-
 #include "debug.h"
 #include "EmuTCPServer.h"
 #include "EmuTCPConnection.h"
@@ -83,14 +79,3 @@ EmuTCPConnection *EmuTCPServer::FindConnection(uint32 iID) {
 	return(nullptr);
 }
 
-
-
-
-
-
-
-
-
-
-
-

common/MaxSkill.cpp

@@ -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: {

common/ProcLauncher.cpp

@@ -352,17 +352,3 @@ ProcLauncher::Spec &ProcLauncher::Spec::operator=(const Spec &other) {
 	return(*this);
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-

common/ProcLauncher.h

@@ -65,21 +65,14 @@ 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:
@@ -96,29 +89,5 @@ private:
 #endif
 };
 
-
-
-
-
-
-
-
-
 #endif /*PROCLAUNCHER_H_*/
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

common/TCPConnection.cpp

@@ -943,7 +943,3 @@ bool TCPConnection::RunLoop() {
 	return ret;
 }
 
-
-
-
-

common/TCPConnection.h

@@ -177,5 +177,3 @@ private:
 
 #endif
 
-
-

common/TCPServer.cpp

@@ -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;
 }
 
-

common/XMLParser.h

@@ -54,6 +54,3 @@ protected:
 
 #endif
 
-
-
-

common/dbmemshare.cpp

@@ -1,5 +1,3 @@
-
-
 // Doors
 #ifdef SHAREMEM
 int32 Database::GetDoorsCount(uint32* oMaxID) {

common/debug.cpp

@@ -437,5 +437,3 @@ void EQEMuLog::SetAllCallbacks(msgCallbackPva proc) {
 	}
 }
 
-
-

common/emu_opcodes.h

@@ -49,5 +49,3 @@ extern const char *OpcodeNames[_maxEmuOpcode+1];
 
 #endif
 
-
-

common/eq_packet_structs.h

@@ -225,18 +225,18 @@ struct Spawn_Struct {
 /*0088*/ uint8	findable;			// 0=can't be found, 1=can be found
 /*0089*/ uint8	unknown0089[5];
 /*0094*/ signed	deltaHeading:10;	// change in heading
-         signed   x:19;           // x coord
-         signed   padding0054:3;  // ***Placeholder
+/*????*/ signed	x:19;				// x coord
+/*????*/ signed	padding0054:3;		// ***Placeholder
 /*0098*/ signed	y:19;				// y coord
-         signed   animation:10;   // animation
-         signed   padding0058:3;  // ***Placeholder
+/*????*/ signed	animation:10;		// animation
+/*????*/ 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
-         signed   padding0066:7;  // ***Placeholder
+/*????*/ unsigned	heading:12;		// heading
+/*????*/ 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
-**      or give a pet a weapon (model changes)
+** When somebody changes what they're wearing 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*/
+/*0012*/ signed		padding010:4;
 };
 
 /*
@@ -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 {
@@ -5080,3 +5078,4 @@ typedef std::list<ServerLootItem_Struct*> ItemList;
 #pragma pack()
 
 #endif
+

common/eqtime.cpp

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

common/extprofile.cpp

@@ -50,8 +50,3 @@ bool SetExtendedProfile(ExtendedProfile_Struct *to, char *old, unsigned int len)
 	return(false);
 }
 
-
-
-
-
-

common/fixed_memory_hash_set.h

@@ -249,3 +249,4 @@ namespace EQEmu {
 } // EQEmu
 
 #endif
+

common/logsys.cpp

@@ -155,6 +155,3 @@ bool load_log_settings(const char *filename) {
 	return(true);
 }
 
-
-
-

common/logsys.h

@@ -33,13 +33,7 @@
 *		- 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
 *
- * 
- * 
- * 
 * this is very C-ish, not C++ish, but thats how I felt like writting it
- * 
- * 
- * 
 */
 
 #include <stdarg.h>
@@ -175,13 +169,5 @@ extern void log_toggle(LogType t);
 
 extern bool load_log_settings(const char *filename);
 
-
-
-
 #endif /*LOGSYS_H_*/
 
-	
-
-
-
-

common/logsys_eqemu.cpp

@@ -37,7 +37,3 @@ void log_messageVA(LogType type, const char *fmt, va_list args) {
 	LogFile->writePVA(EQEMuLog::Debug, prefix_buffer, fmt, args);
 }
 
-
-
-
-

common/logtypes.h

@@ -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
 
-
-
-

common/md5.cpp

@@ -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;
 }
+

common/misc.h

@@ -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
+

common/opcodemgr.cpp

@@ -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;
 }
 
-
-
-
-
-
-

common/opcodemgr.h

@@ -162,15 +162,3 @@ protected:
 
 #endif
 
-
-
-
-
-
-
-
-
-
-
-
-

common/packet_dump.cpp

@@ -193,3 +193,4 @@ void DumpPacketBin(const void* iData, uint32 len) {
 		cout << " " << hex << setw(2) << setfill('0') << (int) data[k-1] << dec;
 	cout << endl;
 }
+

common/packet_dump.h

@@ -33,3 +33,4 @@ void DumpPacketBin(uint16 data);
 void DumpPacketBin(uint8 data);
 
 #endif
+

common/platform.cpp

@@ -9,3 +9,4 @@ void RegisterExecutablePlatform(EQEmuExePlatform p) {
 const EQEmuExePlatform& GetExecutablePlatform() {
 	return exe_platform;
 }
+

common/races.h

@@ -508,9 +508,7 @@ $races_table = array(
 		402 => "Invader Soldier Elite",
 		403 => "UNKNOWN RACE",
 		404 => "Discord Ship",
-
-
 */
 
-
 #endif
+

common/rdtsc.cpp

@@ -166,7 +166,3 @@ void RDTSC_Collector::reset() {
 	_count = 0;
 }
 
-
-
-
-

common/rdtsc.h

@@ -83,5 +83,4 @@ protected:
 	int64 _count;
 };
 
-
 #endif

common/rulesys.cpp

@@ -54,18 +54,15 @@ CREATE TABLE rule_values (
 
 Commands:
 #rules:
- - current -> lists current set name
- - switch (set name) -> change set in the DB, but dont reload
- - 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
- - store [set name] -> store the current rules in this zone to the set (or
-       active if not specified)
- - reset -> reset all rule values to their defaults.
- - list [catname]
- - set (cat) (rule) (value)
- - values [catname] -> show the values of all rules in the specified category/
-
-
+	current -> lists current set name
+	switch (set name) -> change set in the DB, but dont reload
+	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
+	store [set name] -> store the current rules in this zone to the set (or active if not specified)
+	reset -> reset all rule values to their defaults.
+	list [catname]
+	set (cat) (rule) (value)
+	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);
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

common/rulesys.h

@@ -152,3 +152,4 @@ private:
 };
 
 #endif /*RULESYS_H_*/
+

common/shareddb.cpp

@@ -1,4 +1,3 @@
-
 #include "shareddb.h"
 #include <iostream>
 #include <cstring>

common/timer.cpp

@@ -192,3 +192,4 @@ const uint32 Timer::SetCurrentTime()
 //	cerr << "Current time:" << current_time << endl;
 	return current_time;
 }
+

common/types.h

@@ -110,6 +110,4 @@ typedef const char Const_char;	//for perl XS
 #define DLLFUNC extern "C"
 #endif
 
-
-
 #endif

common/unix.cpp

@@ -46,4 +46,3 @@ char* strlwr(char* tmp) {
 	int joe = 1;
 #endif /* !WIN32 */
 
-

common/unix.h

@@ -32,3 +32,4 @@ char* strlwr(char* tmp);
 #endif
 #endif
 #endif
+

common/useperl.h

@@ -48,3 +48,4 @@ extern "C" {	//the perl headers dont do this for us...
 
 
 #endif /*EMU_PERL_H_*/
+

common/worldconn.cpp

@@ -94,8 +94,3 @@ void WorldConnection::Disconnect() {
 	tcpc.Disconnect();
 }
 
-
-
-
-
-

eqlaunch/ZoneLaunch.cpp

@@ -250,38 +250,3 @@ void ZoneLaunch::OnTerminate(const ProcLauncher::ProcRef &ref, const ProcLaunche
 	SendStatus();
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

eqlaunch/ZoneLaunch.h

@@ -75,13 +75,4 @@ private:
 	static Timer s_startTimer;
 };
 
-
-
-
-
-
-
-
-
-
 #endif /*ZONELAUNCH_H_*/

loginserver/EQCryptoAPI.h

@@ -23,3 +23,4 @@ char* Encrypt(const char* buffer, unsigned int bufferSize, unsigned int &outSize
 void _HeapDeleteCharBuffer(char *buffer);
 
 #endif
+

loginserver/ErrorLog.cpp

@@ -207,3 +207,4 @@ void ErrorLog::LogPacket(eqLogType type, const char *data, size_t size)
 
 	log_mutex->unlock();
 }
+

loginserver/ServerManager.cpp

@@ -342,3 +342,4 @@ void ServerManager::DestroyServerByName(string l_name, string s_name, WorldServe
 		iter++;
 	}
 }
+

queryserv/database.cpp

@@ -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
 		}
 	}
 }
+

queryserv/database.h

@@ -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
+

queryserv/lfguild.cpp

@@ -433,3 +433,4 @@ void LFGuildManager::SendGuildStatus(uint32 FromZoneID, uint32 FromInstanceID, c
 		}
 	}
 }
+

queryserv/queryserv.cpp

@@ -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

queryserv/queryservconfig.cpp

@@ -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));
 }
+

queryserv/queryservconfig.h

@@ -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
+

shared_memory/skill_caps.h

@@ -23,3 +23,4 @@ class SharedDatabase;
 void LoadSkillCaps(SharedDatabase *database);
 
 #endif
+

shared_memory/spells.cpp

@@ -40,3 +40,4 @@ void LoadSpells(SharedDatabase *database) {
 	database->LoadSpells(ptr, records);
 	mutex.Unlock();
 }
+

ucs/CMakeLists.txt

@@ -34,6 +34,7 @@ IF(MINGW)
 ENDIF(MINGW)
 
 IF(UNIX)
+
 	IF(NOT FREEBSD)
 		TARGET_LINK_LIBRARIES(ucs "dl")
 	ENDIF(NOT FREEBSD)

ucs/chatchannel.cpp

@@ -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;
 }
+

ucs/clientlist.cpp

@@ -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;
 }
+

ucs/clientlist.h

@@ -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;

ucs/database.cpp

@@ -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;
 }
+

ucs/database.h

@@ -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
+

ucs/ucs.cpp

@@ -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

ucs/ucsconfig.cpp

@@ -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));
 }
+

ucs/ucsconfig.h

@@ -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
+

world/Adventure.cpp

@@ -436,3 +436,4 @@ void Adventure::MoveCorpsesToGraveyard()
 		c_iter++;
 	}
 }
+

world/CMakeLists.txt

@@ -80,6 +80,7 @@ IF(MINGW)
 ENDIF(MINGW)
 
 IF(UNIX)
+
 	IF(NOT FREEBSD)
 		TARGET_LINK_LIBRARIES(world "dl")
 	ENDIF(NOT FREEBSD)

world/EQLConfig.cpp

@@ -357,28 +357,3 @@ map<string,string> EQLConfig::GetZoneDetails(Const_char *zone_ref) {
 	return(res);
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

world/EQLConfig.h

@@ -72,11 +72,5 @@ protected:
 	map<string, LauncherZone> m_zones;	//static zones.
 };
 
-
-
-
-
-
 #endif /*EQLCONFIG_H_*/
 
-

world/EQW.cpp

@@ -55,9 +55,6 @@ extern LoginServerList loginserverlist;
 extern LauncherList launcher_list;
 extern volatile bool	RunLoops;
 
-
-
-
 EQW EQW::s_EQW;
 
 //IO Capture routine
@@ -469,18 +466,3 @@ void EQW::WorldShutDown(uint32 time, uint32 interval) {
 
 #endif //EMBPERL
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

world/EQWHTTPHandler.cpp

@@ -336,5 +336,3 @@ ThreadReturnType EQWHTTPServer::ThreadProc(void *data) {
 	THREAD_RETURN(nullptr);
 }*/
 
-
-

world/EQWHTTPHandler.h

@@ -96,6 +96,3 @@ protected:
 
 #endif
 
-
-
-

world/EQWParser.cpp

@@ -226,10 +226,10 @@ bool EQWParser::eval_file(const char * packagename, const char * filename, std::
 
 bool EQWParser::dosub(const char * subname, const std::vector<std::string> &args, string &error, int mode) {
 	bool err = false;
-	dSP;                            /* initialize stack pointer      */
-	ENTER;                          /* everything created after here */
-	SAVETMPS;                       /* ...is a temporary variable.   */
-	PUSHMARK(SP);                   /* remember the stack pointer    */
+	dSP;				// initialize stack pointer
+	ENTER;				// everything created after here
+	SAVETMPS;			// ...is a temporary variable
+	PUSHMARK(SP);		// remember the stack pointer
 	if(args.size() > 0)
 	{
 		for(std::vector<std::string>::const_iterator i = args.begin(); i != args.end(); ++i)
@@ -237,14 +237,14 @@ bool EQWParser::dosub(const char * subname, const std::vector<std::string> &args
 			XPUSHs(sv_2mortal(newSVpv(i->c_str(), i->length())));
 		}
 	}
-	PUTBACK;                      /* make local stack pointer global */
+	PUTBACK;					// make local stack pointer global
 	call_pv(subname, mode);		/*eval our code*/
-	SPAGAIN;                        /* refresh stack pointer         */
+	SPAGAIN;					// refresh stack pointer
 	if(SvTRUE(ERRSV)) {
 		err = true;
 	}
-	FREETMPS;                       /* free temp values        */
-	LEAVE;                       /* ...and the XPUSHed "mortal" args.*/
+	FREETMPS;		// free temp values
+	LEAVE;			// ...and the XPUSHed "mortal" args.
 
 	if(err) {
 		error = "Perl runtime error: ";
@@ -260,7 +260,6 @@ bool EQWParser::eval(const char * code, string &error) {
 	return(dosub("my_eval", arg, error, G_SCALAR|G_DISCARD|G_EVAL|G_KEEPERR));
 }
 
-
 void EQWParser::EQW_eval(const char *pkg, const char *code) {
 	char namebuf[64];
 
@@ -330,7 +329,6 @@ class MerchantEditor extends BaseEditor {
 	}
 }
 
-
 function dispatch() {
 	my $dispatcher = $this->_dispatchers[$action];
 	$body = new Template($dispatcher["template"]);
@@ -348,5 +346,5 @@ function dispatch() {
 
 */
 
-
 #endif //EMBPERL
+

world/EQWParser.h

@@ -68,12 +68,5 @@ protected:
 };
 #endif //EMBPERL
 
-
-
-
-
-
-
-
-
 #endif /*EQWPARSER_H_*/
+

world/HTTPRequest.cpp

@@ -80,14 +80,3 @@ void HTTPRequest::redirect(Const_char *URL) {
 	SetResponseCode("302");
 }
 
-
-
-
-
-
-
-
-
-
-
-

world/HTTPRequest.h

@@ -37,7 +37,6 @@ public:
 
 //BEGIN PERL EXPORT
 
-	
 	Const_char * get(Const_char *name, Const_char *default_value = "") const;
 	int getInt(Const_char *name, int default_value = 0) const;
 	float getFloat(Const_char *name, float default_value = 0.0) const;
@@ -57,8 +56,5 @@ protected:
 	std::map<std::string, std::string> m_values;
 };
 
-
 #endif /*HTTPREQUEST_H_*/
 
-
-

world/LauncherLink.h

@@ -74,8 +74,5 @@ protected:
 	std::map<std::string, ZoneState> m_states;
 };
 
-
-
-
-
 #endif /*LAUNCHERLINK_H_*/
+

world/LauncherList.cpp

@@ -194,29 +194,3 @@ void LauncherList::Remove(const char *name) {
 	}
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

world/LauncherList.h

@@ -54,14 +54,5 @@ protected:
 	int nextID;
 };
 
-
-
-
-
-
-
-
-
-
-
 #endif /*LAUNCHERLIST_H_*/
+

world/LoginServer.cpp

@@ -198,7 +198,6 @@ DumpPacket(pack->pBuffer, pack->size);
 				break;
 			}
 		}
-
 		delete pack;
 	}
 

world/client.cpp

@@ -2034,3 +2034,4 @@ void Client::SetRacialLanguages( PlayerProfile_Struct *pp )
 		}
 	}
 }
+

world/client.h

@@ -111,7 +111,6 @@ private:
 	EQStreamInterface* const eqs;
 };
 
-
 bool CheckCharCreateInfoSoF(CharCreate_Struct *cc);
 bool CheckCharCreateInfoTitanium(CharCreate_Struct *cc);
 

world/cliententry.cpp

@@ -295,32 +295,3 @@ bool ClientListEntry::CheckAuth(uint32 id, const char* iKey, uint32 ip) {
 	return false;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

world/cliententry.h

@@ -122,5 +122,5 @@ private:
 	char	pLFGComments[64];
 };
 
-
 #endif /*CLIENTENTRY_H_*/
+

world/clientlist.cpp

@@ -1360,3 +1360,4 @@ void ClientList::SendClientVersionSummary(const char *Name)
 	zoneserver_list.SendEmoteMessage(Name, 0, 0, 13, "There are %i 6.2, %i Titanium, %i SoF, %i SoD, %i UF, %i RoF clients currently connected.",
 					Client62Count, ClientTitaniumCount, ClientSoFCount, ClientSoDCount, ClientUnderfootCount, ClientRoFCount);
 }
+

world/clientlist.h

@@ -79,7 +79,5 @@ protected:
 
 };
 
-
-
-
 #endif /*CLIENTLIST_H_*/
+