pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 18:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into StringFormatting.

Browse Source 
Cleaned up the problems. Tested on Linux. Still need to test on windows.

Conflicts:
	common/CMakeLists.txt
	common/MiscFunctions.cpp
	common/MiscFunctions.h
	common/debug.cpp
	world/Adventure.cpp
This commit is contained in:
Arthur Ice 2013-05-19 18:56:21 -07:00
commit f1a487f606
618 changed files with 38225 additions and 38967 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -84,6 +84,14 @@ ELSE(MSVC)
ADD_DEFINITIONS(-DHAS_UNION_SEMUN) ADD_DEFINITIONS(-DHAS_UNION_SEMUN)
ENDIF(MSVC) ENDIF(MSVC)
#FreeBSD support
IF(UNIX)
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
ADD_DEFINITIONS(-DFREEBSD)
SET(FREEBSD TRUE)
ENDIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
ENDIF(UNIX)
#use stdint.h types if they exist for this platform (we have to guess otherwise) #use stdint.h types if they exist for this platform (we have to guess otherwise)
CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H) CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H)
IF(HAVE_STDINT_H) IF(HAVE_STDINT_H)

1
cmake/FindMySQL.cmake
View File

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

21
common/BasePacket.cpp
View File

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

2
common/BasePacket.h
View File

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

1
common/CRC16.cpp
View File

@ -12,3 +12,4 @@ uint16 CRC16(const unsigned char *buf, int size, int key)
crc = CRC32::Update(buf, size, crc); crc = CRC32::Update(buf, size, crc);
return CRC32::Finish(crc) & 0xffff; return CRC32::Finish(crc) & 0xffff;
} }

3
common/EQDB.cpp
View File

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

1
common/EQDBRes.cpp
View File

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

24
common/EQEmuConfig.cpp
View File

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

3
common/EQStream.cpp
View File

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

2
common/EQStream.h
View File

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

18
common/EQStreamFactory.cpp
View File

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

35
common/EQStreamIdent.cpp
View File

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

2
common/EQStreamLocator.h
View File

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

9
common/EQStreamProxy.h
View File

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

41
common/EmuTCPConnection.cpp
View File

@ -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" #include "../common/debug.h"
@ -141,7 +121,6 @@ EmuTCPConnection::~EmuTCPConnection() {
//the queues free their content right now I believe. //the queues free their content right now I believe.
} }
EmuTCPNetPacket_Struct* EmuTCPConnection::MakePacket(ServerPacket* pack, uint32 iDestination) { EmuTCPNetPacket_Struct* EmuTCPConnection::MakePacket(ServerPacket* pack, uint32 iDestination) {
int32 size = sizeof(EmuTCPNetPacket_Struct) + pack->size; int32 size = sizeof(EmuTCPNetPacket_Struct) + pack->size;
if (pack->compressed) { if (pack->compressed) {
@ -473,7 +452,6 @@ void EmuTCPConnection::ClearBuffers() {
timeout_timer.Start(); timeout_timer.Start();
} }
void EmuTCPConnection::SendNetErrorPacket(const char* reason) { void EmuTCPConnection::SendNetErrorPacket(const char* reason) {
#if TCPC_DEBUG >= 1 #if TCPC_DEBUG >= 1
struct in_addr in; struct in_addr in;
@ -842,14 +820,3 @@ bool EmuTCPConnection::RecvData(char* errbuf) {
return(true); return(true);
} }

15
common/EmuTCPServer.cpp
View File

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

3
common/MaxSkill.cpp
View File

@ -644,8 +644,7 @@ uint8 MaxSkillTable(uint16 skillid, uint16 race, uint16 eqclass, uint16 level) {
case MONK: case MONKGM:{ case MONK: case MONKGM:{
// 1 252 252 // 1 252 252
r_value = level*7; // This can't be right can it? r_value = level*7; // This can't be right can it?
break break;
;
} }
case WARRIOR: case WARRIORGM: case WARRIOR: case WARRIORGM:
case ROGUE: case ROGUEGM: { case ROGUE: case ROGUEGM: {

2
common/MiscFunctions.cpp
View File

@ -86,7 +86,6 @@ void CoutTimestamp(bool ms) {
} }
int32 filesize(FILE* fp) { int32 filesize(FILE* fp) {
#ifdef _WINDOWS #ifdef _WINDOWS
return _filelength(_fileno(fp)); return _filelength(_fileno(fp));
@ -392,4 +391,3 @@ float EQHtoFloat(int d)
{ {
return(360.0f - float((d * 360) >> 11)); return(360.0f - float((d * 360) >> 11));
} }

4
common/MiscFunctions.h
View File

@ -92,11 +92,8 @@ int32 filesize(FILE* fp);
uint32 ResolveIP(const char* hostname, char* errbuf = 0); uint32 ResolveIP(const char* hostname, char* errbuf = 0);
bool ParseAddress(const char* iAddress, uint32* oIP, uint16* oPort, char* errbuf = 0); bool ParseAddress(const char* iAddress, uint32* oIP, uint16* oPort, char* errbuf = 0);
void CoutTimestamp(bool ms = true); void CoutTimestamp(bool ms = true);
int MakeRandomInt(int low, int high); int MakeRandomInt(int low, int high);
double MakeRandomFloat(double low, double high); double MakeRandomFloat(double low, double high);
float EQ13toFloat(int d); float EQ13toFloat(int d);
float NewEQ13toFloat(int d); float NewEQ13toFloat(int d);
float EQ19toFloat(int d); float EQ19toFloat(int d);
@ -108,7 +105,6 @@ int FloatToEQH(float d);
#define _ITOA_BUFLEN 25 #define _ITOA_BUFLEN 25
const char *itoa(int num); //not thread safe const char *itoa(int num); //not thread safe
#ifndef _WINDOWS #ifndef _WINDOWS

3
common/Mutex.cpp
View File

@ -66,6 +66,7 @@ bool IsTryLockSupported() {
#endif #endif
Mutex::Mutex() { Mutex::Mutex() {
#if DEBUG_MUTEX_CLASS >= 7 #if DEBUG_MUTEX_CLASS >= 7
cout << "Constructing Mutex" << endl; cout << "Constructing Mutex" << endl;
#endif #endif
@ -74,7 +75,7 @@ Mutex::Mutex() {
#else #else
pthread_mutexattr_t attr; pthread_mutexattr_t attr;
pthread_mutexattr_init(&attr); pthread_mutexattr_init(&attr);
#if defined(__CYGWIN__) || defined(__APPLE__) #if defined(__CYGWIN__) || defined(__APPLE__) || defined(FREEBSD)
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
#else #else
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);

14
common/ProcLauncher.cpp
View File

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

37
common/ProcLauncher.h
View File

@ -65,21 +65,14 @@ public:
virtual void OnTerminate(const ProcRef &ref, const Spec *spec) = 0; 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 ProcRef Launch(Spec *&to_launch); //takes ownership of the pointer
/* /* The terminate method */
* The terminate method
*/
bool Terminate(const ProcRef &proc, bool graceful = true); bool Terminate(const ProcRef &proc, bool graceful = true);
void TerminateAll(bool final = 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(); void Process();
protected: protected:
@ -96,29 +89,5 @@ private:
#endif #endif
}; };
#endif /*PROCLAUNCHER_H_*/ #endif /*PROCLAUNCHER_H_*/

4
common/TCPConnection.cpp
View File

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

2
common/TCPConnection.h
View File

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

7
common/TCPServer.cpp
View File

@ -1,5 +1,3 @@
#include "debug.h" #include "debug.h"
#include "TCPServer.h" #include "TCPServer.h"
#include <stdio.h> #include <stdio.h>
@ -18,12 +16,8 @@
#define SOCKET_ERROR -1 #define SOCKET_ERROR -1
#endif #endif
#define SERVER_LOOP_GRANULARITY 3 //# of ms between checking our socket/queues #define SERVER_LOOP_GRANULARITY 3 //# of ms between checking our socket/queues
BaseTCPServer::BaseTCPServer(uint16 in_port) { BaseTCPServer::BaseTCPServer(uint16 in_port) {
NextID = 1; NextID = 1;
pPort = in_port; pPort = in_port;
@ -230,4 +224,3 @@ bool BaseTCPServer::IsOpen() {
return ret; return ret;
} }

3
common/XMLParser.h
View File

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

2
common/dbmemshare.cpp
View File

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

10
common/debug.cpp
View File

@ -9,6 +9,7 @@
#include <process.h> #include <process.h>
#define snprintf _snprintf #define snprintf _snprintf
#define vsnprintf _vsnprintf
#define strncasecmp _strnicmp #define strncasecmp _strnicmp
#define strcasecmp _stricmp #define strcasecmp _stricmp
#else #else
@ -107,6 +108,7 @@ bool EQEMuLog::open(LogIDs id) {
filename.append("_shared_memory"); filename.append("_shared_memory");
} }
#ifndef NO_PIDLOG #ifndef NO_PIDLOG
// According to http://msdn.microsoft.com/en-us/library/vstudio/ee404875(v=vs.100).aspx // According to http://msdn.microsoft.com/en-us/library/vstudio/ee404875(v=vs.100).aspx
// Visual Studio 2010 doesn't have std::to_string(int) but it does have one for // Visual Studio 2010 doesn't have std::to_string(int) but it does have one for
@ -157,12 +159,10 @@ bool EQEMuLog::write(LogIDs id, const char *fmt, ...) {
va_list argptr, tmpargptr; va_list argptr, tmpargptr;
va_start(argptr, fmt); va_start(argptr, fmt);
if (dofile) { if (dofile) {
va_copy(tmpargptr, argptr); va_copy(tmpargptr, argptr);
vfprintf( fp[id], fmt, tmpargptr ); vfprintf( fp[id], fmt, tmpargptr );
} }
if(logCallbackFmt[id]) { if(logCallbackFmt[id]) {
msgCallbackFmt p = logCallbackFmt[id]; msgCallbackFmt p = logCallbackFmt[id];
va_copy(tmpargptr, argptr); va_copy(tmpargptr, argptr);
@ -183,12 +183,9 @@ bool EQEMuLog::write(LogIDs id, const char *fmt, ...) {
std::cout << outputMessage; std::cout << outputMessage;
} }
} }
va_end(argptr); va_end(argptr);
if (dofile) if (dofile)
fprintf(fp[id], "\n"); fprintf(fp[id], "\n");
if (pLogStatus[id] & 2) { if (pLogStatus[id] & 2) {
if (pLogStatus[id] & 8) { if (pLogStatus[id] & 8) {
std::cerr << std::endl; std::cerr << std::endl;
@ -196,10 +193,8 @@ bool EQEMuLog::write(LogIDs id, const char *fmt, ...) {
std::cout << std::endl; std::cout << std::endl;
} }
} }
if(dofile) if(dofile)
fflush(fp[id]); fflush(fp[id]);
return true; return true;
} }
@ -340,7 +335,6 @@ bool EQEMuLog::writeNTS(LogIDs id, bool dofile, const char *fmt, ...) {
}; };
bool EQEMuLog::Dump(LogIDs id, uint8* data, uint32 size, uint32 cols, uint32 skip) { bool EQEMuLog::Dump(LogIDs id, uint8* data, uint32 size, uint32 cols, uint32 skip) {
if (!logFileValid) { if (!logFileValid) {
#if EQDEBUG >= 10 #if EQDEBUG >= 10
cerr << "Error: Dump() from null pointer"<<endl; cerr << "Error: Dump() from null pointer"<<endl;

18
common/debug.h
View File

@ -1,5 +1,5 @@
/* EQEMu: Everquest Server Emulator /* EQEMu: Everquest Server Emulator
Copyright (C) 2001-2013 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 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
@ -45,8 +45,21 @@
#ifndef _CRTDBG_MAP_ALLOC #ifndef _CRTDBG_MAP_ALLOC
#include <stdlib.h> #include <stdlib.h>
#include <crtdbg.h> #include <crtdbg.h>
#if (_MSC_VER < 1300)
#include <new>
#include <memory>
#define _CRTDBG_MAP_ALLOC
#define new new(_NORMAL_BLOCK, __FILE__, __LINE__)
#define malloc(s) _malloc_dbg(s, _NORMAL_BLOCK, __FILE__, __LINE__)
#endif #endif
#endif #endif
#endif
#ifdef _WINDOWS
// VS6 doesn't like the length of STL generated names: disabling
#pragma warning(disable:4786)
#pragma warning(disable:4996)
#endif
#ifndef EQDEBUG_H #ifndef EQDEBUG_H
#define EQDEBUG_H #define EQDEBUG_H
@ -69,7 +82,6 @@
#include "logsys.h" #include "logsys.h"
#include "common_profile.h" #include "common_profile.h"
#ifdef ZONE #ifdef ZONE
#include "../zone/zone_profile.h" #include "../zone/zone_profile.h"
#endif #endif
@ -148,7 +160,5 @@ public:
LARGE_INTEGER tmp; LARGE_INTEGER tmp;
int64* p; int64* p;
}; };
#endif #endif
#endif #endif

2
common/emu_opcodes.h
View File

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

25
common/eq_packet_structs.h
View File

@ -225,18 +225,18 @@ struct Spawn_Struct {
/*0088*/ uint8 findable; // 0=can't be found, 1=can be found /*0088*/ uint8 findable; // 0=can't be found, 1=can be found
/*0089*/ uint8 unknown0089[5]; /*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 /*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 /*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 /*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 /*0110*/ signed deltaZ:13; // change in z
signed padding0070:19; // ***Placeholder /*????*/ signed padding0070:19; // ***Placeholder
/*0114*/ uint8 eyecolor1; // Player's left eye color /*0114*/ uint8 eyecolor1; // Player's left eye color
/*0115*/ uint8 unknown0115[11]; // Was [24] /*0115*/ uint8 unknown0115[11]; // Was [24]
/*0126*/ uint8 StandState; // stand state for SoF+ 0x64 for normal animation /*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 ** Length: 19 Bytes
*/ */
struct WearChange_Struct{ struct WearChange_Struct{
@ -1321,8 +1320,7 @@ struct SpawnPositionUpdate_Struct
/*0000*/ uint16 spawn_id; /*0000*/ uint16 spawn_id;
/*0002*/ uint64 y_pos:19, z_pos:19, x_pos:19, padding002:7; /*0002*/ uint64 y_pos:19, z_pos:19, x_pos:19, padding002:7;
/*0010*/ unsigned heading:12; /*0010*/ unsigned heading:12;
signed padding010:4; /*0012*/ signed padding010:4;
/*0012*/
}; };
/* /*
@ -2457,7 +2455,7 @@ struct Shielding_Struct {
/* /*
** Click Object Action Struct ** Click Object Action Struct
** Response to client clicking on a World Container (ie, forge) ** 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 { struct ClickObjectAction_Struct {
@ -5080,3 +5078,4 @@ typedef std::list<ServerLootItem_Struct*> ItemList;
#pragma pack() #pragma pack()
#endif #endif

5
common/eqtime.cpp
View File

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

5
common/extprofile.cpp
View File

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

1
common/fixed_memory_hash_set.h
View File

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

3
common/logsys.cpp
View File

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

14
common/logsys.h
View File

@ -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 * - 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 <stdarg.h>
@ -175,13 +169,5 @@ extern void log_toggle(LogType t);
extern bool load_log_settings(const char *filename); extern bool load_log_settings(const char *filename);
#endif /*LOGSYS_H_*/ #endif /*LOGSYS_H_*/

4
common/logsys_eqemu.cpp
View File

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

7
common/logtypes.h
View File

@ -16,8 +16,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef LOG_CATEGORY #ifndef LOG_CATEGORY
#define LOG_CATEGORY(name) #define LOG_CATEGORY(name)
#endif #endif
@ -32,8 +30,6 @@
#endif #endif
LOG_CATEGORY( CHAT ) LOG_CATEGORY( CHAT )
LOG_TYPE( CHAT, SAY, DISABLED ) LOG_TYPE( CHAT, SAY, DISABLED )
LOG_TYPE( CHAT, EMOTE, DISABLED ) LOG_TYPE( CHAT, EMOTE, DISABLED )
@ -260,6 +256,3 @@ LOG_TYPE( WORLD, LAUNCH_TRACE, ENABLED )
#undef LOG_TYPE #undef LOG_TYPE
#undef LOG_CATEGORY #undef LOG_CATEGORY

6
common/md5.cpp
View File

@ -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, c, d, a, b, input[ 2]+0x2ad7d2bb, 15);
MD5STEP(F4, b, c, d, a, input[ 9]+0xeb86d391, 21); 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;
} }

3
common/memory_mapped_file.cpp
View File

@ -29,6 +29,9 @@
#include <stdio.h> #include <stdio.h>
#endif #endif
#include "eqemu_exception.h" #include "eqemu_exception.h"
#ifdef FREEBSD
#include <sys/stat.h>
#endif
namespace EQEmu { namespace EQEmu {

1
common/misc.h
View File

@ -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); void print_hex(const char *buffer, unsigned long length);
#endif #endif

10
common/opcodemgr.cpp
View File

@ -180,7 +180,6 @@ bool RegularOpcodeManager::ReloadOpcodes(const char *filename, bool report_error
return(ret); return(ret);
} }
uint16 RegularOpcodeManager::EmuToEQ(const EmuOpcode emu_op) { uint16 RegularOpcodeManager::EmuToEQ(const EmuOpcode emu_op) {
//opcode is checked for validity in GetEQOpcode //opcode is checked for validity in GetEQOpcode
uint16 res; uint16 res;
@ -221,7 +220,6 @@ void RegularOpcodeManager::SetOpcode(EmuOpcode emu_op, uint16 eq_op) {
s.Set(emu_op, eq_op); s.Set(emu_op, eq_op);
} }
void RegularOpcodeManager::NormalMemStrategy::Set(EmuOpcode emu_op, uint16 eq_op) { void RegularOpcodeManager::NormalMemStrategy::Set(EmuOpcode emu_op, uint16 eq_op) {
if(uint32(emu_op) >= it->EmuOpcodeCount || eq_op >= it->EQOpcodeCount) if(uint32(emu_op) >= it->EmuOpcodeCount || eq_op >= it->EQOpcodeCount)
return; return;
@ -233,7 +231,6 @@ NullOpcodeManager::NullOpcodeManager()
: MutableOpcodeManager() { : MutableOpcodeManager() {
} }
bool NullOpcodeManager::LoadOpcodes(const char *filename, bool report_errors) { bool NullOpcodeManager::LoadOpcodes(const char *filename, bool report_errors) {
return(true); return(true);
} }
@ -254,7 +251,6 @@ EmptyOpcodeManager::EmptyOpcodeManager()
: MutableOpcodeManager() { : MutableOpcodeManager() {
} }
bool EmptyOpcodeManager::LoadOpcodes(const char *filename, bool report_errors) { bool EmptyOpcodeManager::LoadOpcodes(const char *filename, bool report_errors) {
return(true); return(true);
} }
@ -280,9 +276,3 @@ void EmptyOpcodeManager::SetOpcode(EmuOpcode emu_op, uint16 eq_op) {
eq_to_emu[eq_op] = emu_op; eq_to_emu[eq_op] = emu_op;
} }

12
common/opcodemgr.h
View File

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

1
common/packet_dump.cpp
View File

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

1
common/packet_dump.h
View File

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

1
common/platform.cpp
View File

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

4
common/races.h
View File

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

4
common/rdtsc.cpp
View File

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

1
common/rdtsc.h
View File

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

53
common/rulesys.cpp
View File

@ -54,18 +54,15 @@ CREATE TABLE rule_values (
Commands: Commands:
#rules: #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] = { const char *RuleManager::s_categoryNames[_CatCount+1] = {
@ -458,35 +455,3 @@ bool RuleManager::GetBoolRule(RuleManager::BoolType t) const
return (m_RuleBoolValues[t] == 1); return (m_RuleBoolValues[t] == 1);
} }

1
common/rulesys.h
View File

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

1
common/shareddb.cpp
View File

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

1
common/timer.cpp
View File

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

2
common/types.h
View File

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

1
common/unix.cpp
View File

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

1
common/unix.h
View File

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

1
common/useperl.h
View File

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

5
common/worldconn.cpp
View File

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

2
eqlaunch/CMakeLists.txt
View File

@ -26,7 +26,9 @@ IF(MINGW)
ENDIF(MINGW) ENDIF(MINGW)
IF(UNIX) IF(UNIX)
IF(NOT FREEBSD)
TARGET_LINK_LIBRARIES(eqlaunch "dl") TARGET_LINK_LIBRARIES(eqlaunch "dl")
ENDIF(NOT FREEBSD)
TARGET_LINK_LIBRARIES(eqlaunch "z") TARGET_LINK_LIBRARIES(eqlaunch "z")
TARGET_LINK_LIBRARIES(eqlaunch "m") TARGET_LINK_LIBRARIES(eqlaunch "m")
TARGET_LINK_LIBRARIES(eqlaunch "rt") TARGET_LINK_LIBRARIES(eqlaunch "rt")

35
eqlaunch/ZoneLaunch.cpp
View File

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

9
eqlaunch/ZoneLaunch.h
View File

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

2
loginserver/CMakeLists.txt
View File

@ -53,7 +53,9 @@ IF(MINGW)
ENDIF(MINGW) ENDIF(MINGW)
IF(UNIX) IF(UNIX)
IF(NOT FREEBSD)
TARGET_LINK_LIBRARIES(loginserver "dl") TARGET_LINK_LIBRARIES(loginserver "dl")
ENDIF(NOT FREEBSD)
TARGET_LINK_LIBRARIES(loginserver "z") TARGET_LINK_LIBRARIES(loginserver "z")
TARGET_LINK_LIBRARIES(loginserver "m") TARGET_LINK_LIBRARIES(loginserver "m")
TARGET_LINK_LIBRARIES(loginserver "rt") TARGET_LINK_LIBRARIES(loginserver "rt")

1
loginserver/EQCryptoAPI.h
View File

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

1
loginserver/ErrorLog.cpp
View File

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

1
loginserver/ServerManager.cpp
View File

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

2
queryserv/CMakeLists.txt
View File

@ -32,7 +32,9 @@ IF(MINGW)
ENDIF(MINGW) ENDIF(MINGW)
IF(UNIX) IF(UNIX)
IF(NOT FREEBSD)
TARGET_LINK_LIBRARIES(queryserv "dl") TARGET_LINK_LIBRARIES(queryserv "dl")
ENDIF(NOT FREEBSD)
TARGET_LINK_LIBRARIES(queryserv "z") TARGET_LINK_LIBRARIES(queryserv "z")
TARGET_LINK_LIBRARIES(queryserv "m") TARGET_LINK_LIBRARIES(queryserv "m")
TARGET_LINK_LIBRARIES(queryserv "rt") TARGET_LINK_LIBRARIES(queryserv "rt")

5
queryserv/database.cpp
View File

@ -1,6 +1,4 @@
/* /* EQEMu: Everquest Server Emulator
EQEMu: Everquest Server Emulator
Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) Copyright (C) 2001-2008 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
@ -321,3 +319,4 @@ void Database::LogMerchantTransaction(QSMerchantLogTransaction_Struct* QS, uint3
} }
} }
} }

5
queryserv/database.h
View File

@ -1,6 +1,4 @@
/* /* EQEMu: Everquest Server Emulator
EQEMu: Everquest Server Emulator
Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) Copyright (C) 2001-2008 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
@ -61,3 +59,4 @@ private:
}; };
#endif #endif

1
queryserv/lfguild.cpp
View File

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

4
queryserv/queryserv.cpp
View File

@ -1,6 +1,4 @@
/* /* EQEMu: Everquest Server Emulator
EQEMu: Everquest Server Emulator
Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) Copyright (C) 2001-2008 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

5
queryserv/queryservconfig.cpp
View File

@ -1,6 +1,4 @@
/* /* EQEMu: Everquest Server Emulator
EQEMu: Everquest Server Emulator
Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) Copyright (C) 2001-2008 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
@ -27,3 +25,4 @@ queryservconfig *queryservconfig::_chat_config = nullptr;
string queryservconfig::GetByName(const string &var_name) const { string queryservconfig::GetByName(const string &var_name) const {
return(EQEmuConfig::GetByName(var_name)); return(EQEmuConfig::GetByName(var_name));
} }

5
queryserv/queryservconfig.h
View File

@ -1,6 +1,4 @@
/* /* EQEMu: Everquest Server Emulator
EQEMu: Everquest Server Emulator
Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) Copyright (C) 2001-2008 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
@ -54,3 +52,4 @@ public:
}; };
#endif #endif

2
shared_memory/CMakeLists.txt
View File

@ -31,7 +31,9 @@ IF(MINGW)
ENDIF(MINGW) ENDIF(MINGW)
IF(UNIX) IF(UNIX)
IF(NOT FREEBSD)
TARGET_LINK_LIBRARIES(shared_memory "dl") TARGET_LINK_LIBRARIES(shared_memory "dl")
ENDIF(NOT FREEBSD)
TARGET_LINK_LIBRARIES(shared_memory "z") TARGET_LINK_LIBRARIES(shared_memory "z")
TARGET_LINK_LIBRARIES(shared_memory "m") TARGET_LINK_LIBRARIES(shared_memory "m")
TARGET_LINK_LIBRARIES(shared_memory "rt") TARGET_LINK_LIBRARIES(shared_memory "rt")

1
shared_memory/skill_caps.h
View File

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

1
shared_memory/spells.cpp
View File

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

3
ucs/CMakeLists.txt
View File

@ -34,7 +34,10 @@ IF(MINGW)
ENDIF(MINGW) ENDIF(MINGW)
IF(UNIX) IF(UNIX)
IF(NOT FREEBSD)
TARGET_LINK_LIBRARIES(ucs "dl") TARGET_LINK_LIBRARIES(ucs "dl")
ENDIF(NOT FREEBSD)
TARGET_LINK_LIBRARIES(ucs "z") TARGET_LINK_LIBRARIES(ucs "z")
TARGET_LINK_LIBRARIES(ucs "m") TARGET_LINK_LIBRARIES(ucs "m")
TARGET_LINK_LIBRARIES(ucs "rt") TARGET_LINK_LIBRARIES(ucs "rt")

5
ucs/chatchannel.cpp
View File

@ -1,6 +1,4 @@
/* /* EQEMu: Everquest Server Emulator
EQEMu: Everquest Server Emulator
Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) Copyright (C) 2001-2008 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
@ -704,3 +702,4 @@ string CapitaliseName(string inString) {
return NormalisedName; return NormalisedName;
} }

5
ucs/clientlist.cpp
View File

@ -1,6 +1,4 @@
/* /* EQEMu: Everquest Server Emulator
EQEMu: Everquest Server Emulator
Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) Copyright (C) 2001-2008 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
@ -2407,3 +2405,4 @@ int Client::GetCharID() {
return Characters[0].CharID; return Characters[0].CharID;
} }

10
ucs/clientlist.h
View File

@ -1,6 +1,4 @@
/* /* EQEMu: Everquest Server Emulator
EQEMu: Everquest Server Emulator
Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) Copyright (C) 2001-2008 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
@ -32,12 +30,14 @@
#define MAX_JOINED_CHANNELS 10 #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, CommandOPList, CommandInvite, CommandGrant, CommandModerate, CommandVoice, CommandKick,
CommandPassword, CommandToggleInvites, CommandAFK, CommandUptime, CommandPassword, CommandToggleInvites, CommandAFK, CommandUptime,
CommandGetHeaders, CommandGetBody, CommandMailTo, CommandSetMessageStatus, CommandSelectMailBox, CommandGetHeaders, CommandGetBody, CommandMailTo, CommandSetMessageStatus, CommandSelectMailBox,
CommandSetMailForwarding, CommandBuddy, CommandIgnorePlayer, CommandSetMailForwarding, CommandBuddy, CommandIgnorePlayer,
CommandEndOfList }; CommandEndOfList
};
struct CommandEntry { struct CommandEntry {
const char *CommandString; const char *CommandString;

5
ucs/database.cpp
View File

@ -1,6 +1,4 @@
/* /* EQEMu: Everquest Server Emulator
EQEMu: Everquest Server Emulator
Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) Copyright (C) 2001-2008 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
@ -769,3 +767,4 @@ void Database::GetFriendsAndIgnore(int CharID, vector<string> &Friends, vector<s
return; return;
} }

5
ucs/database.h
View File

@ -1,6 +1,4 @@
/* /* EQEMu: Everquest Server Emulator
EQEMu: Everquest Server Emulator
Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) Copyright (C) 2001-2008 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
@ -71,3 +69,4 @@ private:
}; };
#endif #endif

4
ucs/ucs.cpp
View File

@ -1,6 +1,4 @@
/* /* EQEMu: Everquest Server Emulator
EQEMu: Everquest Server Emulator
Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) Copyright (C) 2001-2008 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

5
ucs/ucsconfig.cpp
View File

@ -1,6 +1,4 @@
/* /* EQEMu: Everquest Server Emulator
EQEMu: Everquest Server Emulator
Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) Copyright (C) 2001-2008 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
@ -27,3 +25,4 @@ ucsconfig *ucsconfig::_chat_config = nullptr;
string ucsconfig::GetByName(const string &var_name) const { string ucsconfig::GetByName(const string &var_name) const {
return(EQEmuConfig::GetByName(var_name)); return(EQEmuConfig::GetByName(var_name));
} }

5
ucs/ucsconfig.h
View File

@ -1,6 +1,4 @@
/* /* EQEMu: Everquest Server Emulator
EQEMu: Everquest Server Emulator
Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) Copyright (C) 2001-2008 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
@ -54,3 +52,4 @@ public:
}; };
#endif #endif

BIN
utils/EQExtractor2/EQExtractor2/PacketDotNet.dll
View File

Binary file not shown.

BIN
utils/EQExtractor2/EQExtractor2/SharpPcap.dll
View File

Binary file not shown.

BIN
utils/EQExtractor2/EQExtractor2/log4net.dll
View File

Binary file not shown.

BIN
utils/EQExtractor2/EQExtractor2/zlib.net.dll
View File

Binary file not shown.

8
utils/azone2/global.hpp
View File

@ -9,12 +9,8 @@
#include <netinet/in.h> #include <netinet/in.h>
#endif #endif
#ifndef nullptr typedef unsigned int uint32;
#define nullptr 0 typedef int int32;
#endif
typedef unsigned long uint32;
typedef long int32;
typedef unsigned short uint16; typedef unsigned short uint16;
typedef short int16; typedef short int16;

4
utils/azone2/types.h
View File

@ -1,8 +1,8 @@
#ifndef __EQCLIENT_TYPES_H_ #ifndef __EQCLIENT_TYPES_H_
#define __EQCLIENT_TYPES_H_ #define __EQCLIENT_TYPES_H_
typedef unsigned long uint32; typedef unsigned int uint32;
typedef long int32; typedef int int32;
typedef unsigned short uint16; typedef unsigned short uint16;
typedef short int16; typedef short int16;

BIN
utils/defaults/updated_templates/images/loading.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 673 B

After

Width:  |  Height:  |  Size: 665 B

1
world/Adventure.cpp
View File

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

3
world/CMakeLists.txt
View File

@ -80,7 +80,10 @@ IF(MINGW)
ENDIF(MINGW) ENDIF(MINGW)
IF(UNIX) IF(UNIX)
IF(NOT FREEBSD)
TARGET_LINK_LIBRARIES(world "dl") TARGET_LINK_LIBRARIES(world "dl")
ENDIF(NOT FREEBSD)
TARGET_LINK_LIBRARIES(world "z") TARGET_LINK_LIBRARIES(world "z")
TARGET_LINK_LIBRARIES(world "m") TARGET_LINK_LIBRARIES(world "m")
TARGET_LINK_LIBRARIES(world "rt") TARGET_LINK_LIBRARIES(world "rt")

25
world/EQLConfig.cpp
View File

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

6
world/EQLConfig.h
View File

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

18
world/EQW.cpp
View File

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

2
world/EQWHTTPHandler.cpp
View File

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

3
world/EQWHTTPHandler.h
View File

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

20
world/EQWParser.cpp
View File

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

9
world/EQWParser.h
View File

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

Some files were not shown because too many files have changed in this diff Show More