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

Renaming headers is hard work

Browse Source
This commit is contained in:
KimLS 2014-08-21 17:26:32 -07:00
parent 405884f47d
commit 06f18225ce
55 changed files with 64 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client_files/export/main.cpp
View File

@ -19,7 +19,7 @@
#include <stdio.h> #include <stdio.h>
#include "../../common/debug.h" #include "../../common/debug.h"
#include "../../common/shareddb.h" #include "../../common/shareddb.h"
#include "../../common/EQEmuConfig.h" #include "../../common/eqemu_config.h"
#include "../../common/platform.h" #include "../../common/platform.h"
#include "../../common/crash.h" #include "../../common/crash.h"
#include "../../common/rulesys.h" #include "../../common/rulesys.h"

2
client_files/import/main.cpp
View File

@ -18,7 +18,7 @@
#include "../../common/debug.h" #include "../../common/debug.h"
#include "../../common/shareddb.h" #include "../../common/shareddb.h"
#include "../../common/EQEmuConfig.h" #include "../../common/eqemu_config.h"
#include "../../common/platform.h" #include "../../common/platform.h"
#include "../../common/crash.h" #include "../../common/crash.h"
#include "../../common/rulesys.h" #include "../../common/rulesys.h"

23
common/CMakeLists.txt
View File

@ -93,14 +93,14 @@ SET(common_sources
) )
SET(common_headers SET(common_headers
BasePacket.h base_packet.h
base_data.h base_data.h
bodytypes.h bodytypes.h
breakdowns.h breakdowns.h
classes.h classes.h
Condition.h condition.h
crash.h crash.h
CRC16.h crc16.h
crc32.h crc32.h
database.h database.h
dbasync.h dbasync.h
@ -109,16 +109,16 @@ SET(common_headers
deity.h deity.h
emu_opcodes.h emu_opcodes.h
emu_oplist.h emu_oplist.h
EmuTCPConnection.h emu_tcp_connection.h
EmuTCPServer.h emu_tcp_server.h
eq_constants.h eq_constants.h
eq_dictionary.h eq_dictionary.h
eq_packet_structs.h eq_packet_structs.h
EQDB.h eqdb.h
EQDBRes.h eqdb_res.h
eqemu_exception.h eqemu_exception.h
EQEmuConfig.h eqemu_config.h
EQEmuConfig_elements.h eqemu_config_elements.h
EQEMuError.h EQEMuError.h
EQPacket.h EQPacket.h
EQStream.h EQStream.h
@ -215,11 +215,6 @@ SET(common_headers
patches/RoF_itemfields.h patches/RoF_itemfields.h
patches/RoF_ops.h patches/RoF_ops.h
patches/RoF_structs.h patches/RoF_structs.h
#patches/RoF2.h
#patches/RoF2_constants.h
#patches/RoF2_itemfields.h
#patches/RoF2_ops.h
#patches/RoF2_structs.h
patches/Titanium.h patches/Titanium.h
patches/Titanium_constants.h patches/Titanium_constants.h
patches/Titanium_itemfields.h patches/Titanium_itemfields.h

2
common/EQPacket.h
View File

@ -18,7 +18,7 @@
#ifndef _EQPACKET_H #ifndef _EQPACKET_H
#define _EQPACKET_H #define _EQPACKET_H
#include "BasePacket.h" #include "base_packet.h"
#include "EQStreamType.h" #include "EQStreamType.h"
#include "op_codes.h" #include "op_codes.h"
#include "platform.h" #include "platform.h"

2
common/EQStream.h
View File

@ -15,7 +15,7 @@
#include "Mutex.h" #include "Mutex.h"
#include "../common/opcodemgr.h" #include "../common/opcodemgr.h"
#include "../common/misc.h" #include "../common/misc.h"
#include "../common/Condition.h" #include "../common/condition.h"
#include "../common/timer.h" #include "../common/timer.h"
#define FLAG_COMPRESSED 0x01 #define FLAG_COMPRESSED 0x01

2
common/EQStreamFactory.h
View File

@ -5,7 +5,7 @@
#include <queue> #include <queue>
#include <map> #include <map>
#include "../common/EQStream.h" #include "../common/EQStream.h"
#include "../common/Condition.h" #include "../common/condition.h"
#include "../common/timeoutmgr.h" #include "../common/timeoutmgr.h"
#include "../common/opcodemgr.h" #include "../common/opcodemgr.h"
#include "../common/timer.h" #include "../common/timer.h"

2
common/base_packet.cpp
View File

@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "debug.h" #include "debug.h"
#include "BasePacket.h" #include "base_packet.h"
#include "misc.h" #include "misc.h"
#include "packet_dump.h" #include "packet_dump.h"

0
common/BasePacket.h → common/base_packet.h
View File

2
common/condition.cpp
View File

@ -17,7 +17,7 @@
*/ */
#include "debug.h" #include "debug.h"
#include "Condition.h" #include "condition.h"
#ifdef _WINDOWS #ifdef _WINDOWS

0
common/Condition.h → common/condition.h
View File

0
common/CRC16.h → common/crc16.h
View File

2
common/dbcore.h
View File

@ -13,7 +13,7 @@
#include "../common/linked_list.h" #include "../common/linked_list.h"
#include "../common/queue.h" #include "../common/queue.h"
#include "../common/timer.h" #include "../common/timer.h"
#include "../common/Condition.h" #include "../common/condition.h"
#include "../common/MySQLRequestResult.h" #include "../common/MySQLRequestResult.h"
class DBcore { class DBcore {

4
common/emu_tcp_connection.cpp
View File

@ -30,8 +30,8 @@ tremendously.
#include <stdio.h> #include <stdio.h>
#include <iomanip> #include <iomanip>
#include "EmuTCPConnection.h" #include "emu_tcp_connection.h"
#include "EmuTCPServer.h" #include "emu_tcp_server.h"
#include "../common/servertalk.h" #include "../common/servertalk.h"
#include "../common/packet_dump.h" #include "../common/packet_dump.h"

0
common/EmuTCPConnection.h → common/emu_tcp_connection.h
View File

4
common/emu_tcp_server.cpp
View File

@ -1,6 +1,6 @@
#include "debug.h" #include "debug.h"
#include "EmuTCPServer.h" #include "emu_tcp_server.h"
#include "EmuTCPConnection.h" #include "emu_tcp_connection.h"
EmuTCPServer::EmuTCPServer(uint16 iPort, bool iOldFormat) EmuTCPServer::EmuTCPServer(uint16 iPort, bool iOldFormat)
: TCPServer<EmuTCPConnection>(iPort), : TCPServer<EmuTCPConnection>(iPort),

0
common/EmuTCPServer.h → common/emu_tcp_server.h
View File

2
common/eq_packet.cpp
View File

@ -22,7 +22,7 @@
#include "EQPacket.h" #include "EQPacket.h"
#include "misc.h" #include "misc.h"
#include "op_codes.h" #include "op_codes.h"
#include "CRC16.h" #include "crc16.h"
#include "platform.h" #include "platform.h"
#ifndef STATIC_OPCODE #ifndef STATIC_OPCODE
#include "opcodemgr.h" #include "opcodemgr.h"

2
common/eq_stream.cpp
View File

@ -22,7 +22,7 @@
#include "misc.h" #include "misc.h"
#include "Mutex.h" #include "Mutex.h"
#include "op_codes.h" #include "op_codes.h"
#include "CRC16.h" #include "crc16.h"
#include "platform.h" #include "platform.h"
#include <string> #include <string>

2
common/eqdb.cpp
View File

@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "debug.h" #include "debug.h"
#include "EQDB.h" #include "eqdb.h"
#include "database.h" #include "database.h"
#include <mysql.h> #include <mysql.h>
#include <cstring> #include <cstring>

2
common/EQDB.h → common/eqdb.h
View File

@ -22,7 +22,7 @@
#include <vector> #include <vector>
#include <map> #include <map>
#include "types.h" #include "types.h"
#include "EQDBRes.h" #include "eqdb_res.h"
#include <mysql.h> #include <mysql.h>
//this is the main object exported to perl. //this is the main object exported to perl.

2
common/eqdb_res.cpp
View File

@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "debug.h" #include "debug.h"
#include "EQDBRes.h" #include "eqdb_res.h"
#include <mysql.h> #include <mysql.h>
std::vector<std::string> EQDBRes::fetch_row_array() { std::vector<std::string> EQDBRes::fetch_row_array() {

0
common/EQDBRes.h → common/eqdb_res.h
View File

2
common/eqemu_config.cpp
View File

@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "../common/debug.h" #include "../common/debug.h"
#include "EQEmuConfig.h" #include "eqemu_config.h"
#include "MiscFunctions.h" #include "MiscFunctions.h"
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>

4
common/EQEmuConfig.h → common/eqemu_config.h
View File

@ -112,14 +112,14 @@ protected:
#define ELEMENT(name) \ #define ELEMENT(name) \
void do_##name(TiXmlElement *ele); void do_##name(TiXmlElement *ele);
#include "EQEmuConfig_elements.h" #include "eqemu_config_elements.h"
EQEmuConfig() { EQEmuConfig() {
// import the needed handler prototypes // import the needed handler prototypes
#define ELEMENT(name) \ #define ELEMENT(name) \
Handlers[#name]=(ElementHandler)&EQEmuConfig::do_##name; Handlers[#name]=(ElementHandler)&EQEmuConfig::do_##name;
#include "EQEmuConfig_elements.h" #include "eqemu_config_elements.h"
// Set sane defaults // Set sane defaults

0
common/EQEmuConfig_elements.h → common/eqemu_config_elements.h
View File

2
common/perl_eqdb.cpp
View File

@ -30,7 +30,7 @@ typedef const char Const_char;
#ifdef EMBPERL #ifdef EMBPERL
#include "../common/debug.h" #include "../common/debug.h"
#include "../common/useperl.h" #include "../common/useperl.h"
#include "EQDB.h" #include "eqdb.h"
#ifdef THIS /* this macro seems to leak out on some systems */ #ifdef THIS /* this macro seems to leak out on some systems */
#undef THIS #undef THIS

2
common/perl_eqdb_res.cpp
View File

@ -30,7 +30,7 @@ typedef const char Const_char;
#ifdef EMBPERL #ifdef EMBPERL
#include "../common/debug.h" #include "../common/debug.h"
#include "../common/useperl.h" #include "../common/useperl.h"
#include "EQDBRes.h" #include "eqdb_res.h"
XS(XS_EQDBRes_num_rows); /* prototype to pass -Wmissing-prototypes */ XS(XS_EQDBRes_num_rows); /* prototype to pass -Wmissing-prototypes */

2
common/worldconn.cpp
View File

@ -26,7 +26,7 @@
#include <stdarg.h> #include <stdarg.h>
#include "worldconn.h" #include "worldconn.h"
#include "EQEmuConfig.h" #include "eqemu_config.h"
#include "md5.h" #include "md5.h"
#include "database.h" #include "database.h"
#include "servertalk.h" #include "servertalk.h"

2
common/worldconn.h
View File

@ -19,7 +19,7 @@
#ifndef WORLDCONNECTION_H #ifndef WORLDCONNECTION_H
#define WORLDCONNECTION_H #define WORLDCONNECTION_H
#include "../common/EmuTCPConnection.h" #include "../common/emu_tcp_connection.h"
#include <string> #include <string>
class ServerPacket; class ServerPacket;

2
eqlaunch/ZoneLaunch.cpp
View File

@ -20,7 +20,7 @@
#include "ZoneLaunch.h" #include "ZoneLaunch.h"
#include "worldserver.h" #include "worldserver.h"
#include "../common/EQEmuConfig.h" #include "../common/eqemu_config.h"
//static const uint32 ZONE_RESTART_DELAY = 10000; //static const uint32 ZONE_RESTART_DELAY = 10000;
//static const uint32 ZONE_TERMINATE_WAIT = 10000; //static const uint32 ZONE_TERMINATE_WAIT = 10000;

2
eqlaunch/eqlaunch.cpp
View File

@ -18,7 +18,7 @@
#include "../common/debug.h" #include "../common/debug.h"
#include "../common/ProcLauncher.h" #include "../common/ProcLauncher.h"
#include "../common/EQEmuConfig.h" #include "../common/eqemu_config.h"
#include "../common/servertalk.h" #include "../common/servertalk.h"
#include "../common/platform.h" #include "../common/platform.h"
#include "../common/crash.h" #include "../common/crash.h"

2
eqlaunch/worldserver.cpp
View File

@ -19,7 +19,7 @@
#include "worldserver.h" #include "worldserver.h"
#include "../common/servertalk.h" #include "../common/servertalk.h"
#include "ZoneLaunch.h" #include "ZoneLaunch.h"
#include "../common/EQEmuConfig.h" #include "../common/eqemu_config.h"
#include "../common/StringUtil.h" #include "../common/StringUtil.h"

4
loginserver/ServerManager.h
View File

@ -20,8 +20,8 @@
#include "../common/debug.h" #include "../common/debug.h"
#include "../common/EQStreamFactory.h" #include "../common/EQStreamFactory.h"
#include "../common/EmuTCPConnection.h" #include "../common/emu_tcp_connection.h"
#include "../common/EmuTCPServer.h" #include "../common/emu_tcp_server.h"
#include "../common/servertalk.h" #include "../common/servertalk.h"
#include "../common/packet_dump.h" #include "../common/packet_dump.h"
#include "WorldServer.h" #include "WorldServer.h"

4
loginserver/WorldServer.h
View File

@ -20,8 +20,8 @@
#include "../common/debug.h" #include "../common/debug.h"
#include "../common/EQStreamFactory.h" #include "../common/EQStreamFactory.h"
#include "../common/EmuTCPConnection.h" #include "../common/emu_tcp_connection.h"
#include "../common/EmuTCPServer.h" #include "../common/emu_tcp_server.h"
#include "../common/servertalk.h" #include "../common/servertalk.h"
#include "../common/packet_dump.h" #include "../common/packet_dump.h"
#include <string> #include <string>

2
queryserv/queryservconfig.h
View File

@ -20,7 +20,7 @@
#ifndef __queryservconfig_H #ifndef __queryservconfig_H
#define __queryservconfig_H #define __queryservconfig_H
#include "../common/EQEmuConfig.h" #include "../common/eqemu_config.h"
class queryservconfig : public EQEmuConfig { class queryservconfig : public EQEmuConfig {
public: public:

2
shared_memory/main.cpp
View File

@ -19,7 +19,7 @@
#include <stdio.h> #include <stdio.h>
#include "../common/debug.h" #include "../common/debug.h"
#include "../common/shareddb.h" #include "../common/shareddb.h"
#include "../common/EQEmuConfig.h" #include "../common/eqemu_config.h"
#include "../common/platform.h" #include "../common/platform.h"
#include "../common/crash.h" #include "../common/crash.h"
#include "../common/rulesys.h" #include "../common/rulesys.h"

2
socket_server/socket_server_config.h
View File

@ -20,7 +20,7 @@
#ifndef __socket_server_config_H #ifndef __socket_server_config_H
#define __socket_server_config_H #define __socket_server_config_H
#include "../common/EQEmuConfig.h" #include "../common/eqemu_config.h"
class socket_server_config : public EQEmuConfig { class socket_server_config : public EQEmuConfig {
public: public:

4
ucs/clientlist.cpp
View File

@ -25,8 +25,8 @@
#include "chatchannel.h" #include "chatchannel.h"
#include "../common/EQStreamFactory.h" #include "../common/EQStreamFactory.h"
#include "../common/EmuTCPConnection.h" #include "../common/emu_tcp_connection.h"
#include "../common/EmuTCPServer.h" #include "../common/emu_tcp_server.h"
#include <list> #include <list>
#include <vector> #include <vector>
#include <string> #include <string>

2
ucs/ucsconfig.h
View File

@ -20,7 +20,7 @@
#ifndef __ucsconfig_H #ifndef __ucsconfig_H
#define __ucsconfig_H #define __ucsconfig_H
#include "../common/EQEmuConfig.h" #include "../common/eqemu_config.h"
class ucsconfig : public EQEmuConfig { class ucsconfig : public EQEmuConfig {
public: public:

2
world/EQWParser.cpp
View File

@ -23,7 +23,7 @@
#include "../common/debug.h" #include "../common/debug.h"
#include "EQWParser.h" #include "EQWParser.h"
#include "EQW.h" #include "EQW.h"
#include "../common/EQDB.h" #include "../common/eqdb.h"
#include "../common/logsys.h" #include "../common/logsys.h"
#include "worlddb.h" #include "worlddb.h"

2
world/HTTPRequest.cpp
View File

@ -18,7 +18,7 @@
#include "../common/debug.h" #include "../common/debug.h"
#include "HTTPRequest.h" #include "HTTPRequest.h"
#include "EQWHTTPHandler.h" #include "EQWHTTPHandler.h"
#include "../common/EQDB.h" #include "../common/eqdb.h"
#include "../common/SocketLib/HttpdForm.h" #include "../common/SocketLib/HttpdForm.h"
#include <cstdlib> #include <cstdlib>

2
world/LauncherLink.cpp
View File

@ -24,7 +24,7 @@
#include "../common/md5.h" #include "../common/md5.h"
#include "../common/packet_dump.h" #include "../common/packet_dump.h"
#include "../common/servertalk.h" #include "../common/servertalk.h"
#include "../common/EmuTCPConnection.h" #include "../common/emu_tcp_connection.h"
#include "../common/StringUtil.h" #include "../common/StringUtil.h"
#include "worlddb.h" #include "worlddb.h"
#include "EQLConfig.h" #include "EQLConfig.h"

2
world/LauncherLink.h
View File

@ -18,7 +18,7 @@
#ifndef LAUNCHERLINK_H_ #ifndef LAUNCHERLINK_H_
#define LAUNCHERLINK_H_ #define LAUNCHERLINK_H_
#include "../common/EmuTCPConnection.h" #include "../common/emu_tcp_connection.h"
#include "../common/timer.h" #include "../common/timer.h"
#include <string> #include <string>
#include <vector> #include <vector>

2
world/LoginServer.h
View File

@ -24,7 +24,7 @@
#include "../common/queue.h" #include "../common/queue.h"
#include "../common/eq_packet_structs.h" #include "../common/eq_packet_structs.h"
#include "../common/Mutex.h" #include "../common/Mutex.h"
#include "../common/EmuTCPConnection.h" #include "../common/emu_tcp_connection.h"
class LoginServer{ class LoginServer{
public: public:

2
world/LoginServerList.h
View File

@ -7,7 +7,7 @@
#include "../common/queue.h" #include "../common/queue.h"
#include "../common/eq_packet_structs.h" #include "../common/eq_packet_structs.h"
#include "../common/Mutex.h" #include "../common/Mutex.h"
#include "../common/EmuTCPConnection.h" #include "../common/emu_tcp_connection.h"
#ifdef _WINDOWS #ifdef _WINDOWS
void AutoInitLoginServer(void *tmp); void AutoInitLoginServer(void *tmp);

2
world/WorldConfig.h
View File

@ -18,7 +18,7 @@
#ifndef __WorldConfig_H #ifndef __WorldConfig_H
#define __WorldConfig_H #define __WorldConfig_H
#include "../common/EQEmuConfig.h" #include "../common/eqemu_config.h"
class WorldConfig : public EQEmuConfig { class WorldConfig : public EQEmuConfig {
public: public:

2
world/console.h
View File

@ -38,7 +38,7 @@ enum {
#include "../common/linked_list.h" #include "../common/linked_list.h"
#include "../common/timer.h" #include "../common/timer.h"
#include "../common/queue.h" #include "../common/queue.h"
#include "../common/EmuTCPConnection.h" #include "../common/emu_tcp_connection.h"
#include "WorldTCPConnection.h" #include "WorldTCPConnection.h"
#include "../common/Mutex.h" #include "../common/Mutex.h"

6
world/net.cpp
View File

@ -68,15 +68,15 @@
#endif #endif
#include "../common/dbasync.h"
#include "../common/emu_tcp_server.h"
#include "../common/patches/patches.h"
#include "zoneserver.h" #include "zoneserver.h"
#include "console.h" #include "console.h"
#include "LoginServer.h" #include "LoginServer.h"
#include "LoginServerList.h" #include "LoginServerList.h"
#include "EQWHTTPHandler.h" #include "EQWHTTPHandler.h"
#include "../common/dbasync.h"
#include "../common/EmuTCPServer.h"
#include "WorldConfig.h" #include "WorldConfig.h"
#include "../common/patches/patches.h"
#include "zoneserver.h" #include "zoneserver.h"
#include "zonelist.h" #include "zonelist.h"
#include "clientlist.h" #include "clientlist.h"

2
world/queryserv.cpp
View File

@ -6,7 +6,7 @@
#include "../common/logsys.h" #include "../common/logsys.h"
#include "../common/logtypes.h" #include "../common/logtypes.h"
#include "../common/md5.h" #include "../common/md5.h"
#include "../common/EmuTCPConnection.h" #include "../common/emu_tcp_connection.h"
#include "../common/packet_dump.h" #include "../common/packet_dump.h"
extern ClientList client_list; extern ClientList client_list;

2
world/queryserv.h
View File

@ -2,7 +2,7 @@
#define QueryServ_H #define QueryServ_H
#include "../common/types.h" #include "../common/types.h"
#include "../common/EmuTCPConnection.h" #include "../common/emu_tcp_connection.h"
#include "../common/servertalk.h" #include "../common/servertalk.h"
class QueryServConnection class QueryServConnection

2
world/ucs.cpp
View File

@ -4,7 +4,7 @@
#include "../common/logsys.h" #include "../common/logsys.h"
#include "../common/logtypes.h" #include "../common/logtypes.h"
#include "../common/md5.h" #include "../common/md5.h"
#include "../common/EmuTCPConnection.h" #include "../common/emu_tcp_connection.h"
#include "../common/packet_dump.h" #include "../common/packet_dump.h"
UCSConnection::UCSConnection() UCSConnection::UCSConnection()

2
world/ucs.h
View File

@ -2,7 +2,7 @@
#define UCS_H #define UCS_H
#include "../common/types.h" #include "../common/types.h"
#include "../common/EmuTCPConnection.h" #include "../common/emu_tcp_connection.h"
#include "../common/servertalk.h" #include "../common/servertalk.h"
class UCSConnection class UCSConnection

2
world/zoneserver.h
View File

@ -19,7 +19,7 @@
#define ZONESERVER_H #define ZONESERVER_H
#include "WorldTCPConnection.h" #include "WorldTCPConnection.h"
#include "../common/EmuTCPConnection.h" #include "../common/emu_tcp_connection.h"
#include <string.h> #include <string.h>
#include <string> #include <string>

2
zone/ZoneConfig.h
View File

@ -18,7 +18,7 @@
#ifndef __ZoneConfig_H #ifndef __ZoneConfig_H
#define __ZoneConfig_H #define __ZoneConfig_H
#include "../common/EQEmuConfig.h" #include "../common/eqemu_config.h"
class ZoneConfig : public EQEmuConfig { class ZoneConfig : public EQEmuConfig {
public: public:

2
zone/zone_logsys.cpp
View File

@ -18,7 +18,7 @@
#include "../common/debug.h" #include "../common/debug.h"
#include "../common/logsys.h" #include "../common/logsys.h"
#include "../common/BasePacket.h" #include "../common/base_packet.h"
#include "mob.h" #include "mob.h"
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>