From 06f18225cec42e618e15a7ea6bfe1aaf522eed2a Mon Sep 17 00:00:00 2001 From: KimLS Date: Thu, 21 Aug 2014 17:26:32 -0700 Subject: [PATCH] Renaming headers is hard work --- client_files/export/main.cpp | 2 +- client_files/import/main.cpp | 2 +- common/CMakeLists.txt | 23 ++++++++----------- common/EQPacket.h | 2 +- common/EQStream.h | 2 +- common/EQStreamFactory.h | 2 +- common/base_packet.cpp | 2 +- common/{BasePacket.h => base_packet.h} | 0 common/condition.cpp | 2 +- common/{Condition.h => condition.h} | 0 common/{CRC16.h => crc16.h} | 0 common/dbcore.h | 2 +- common/emu_tcp_connection.cpp | 4 ++-- ...muTCPConnection.h => emu_tcp_connection.h} | 0 common/emu_tcp_server.cpp | 4 ++-- common/{EmuTCPServer.h => emu_tcp_server.h} | 0 common/eq_packet.cpp | 2 +- common/eq_stream.cpp | 2 +- common/eqdb.cpp | 2 +- common/{EQDB.h => eqdb.h} | 2 +- common/eqdb_res.cpp | 2 +- common/{EQDBRes.h => eqdb_res.h} | 0 common/eqemu_config.cpp | 2 +- common/{EQEmuConfig.h => eqemu_config.h} | 4 ++-- ...fig_elements.h => eqemu_config_elements.h} | 0 common/perl_eqdb.cpp | 2 +- common/perl_eqdb_res.cpp | 2 +- common/worldconn.cpp | 2 +- common/worldconn.h | 2 +- eqlaunch/ZoneLaunch.cpp | 2 +- eqlaunch/eqlaunch.cpp | 2 +- eqlaunch/worldserver.cpp | 2 +- loginserver/ServerManager.h | 4 ++-- loginserver/WorldServer.h | 4 ++-- queryserv/queryservconfig.h | 2 +- shared_memory/main.cpp | 2 +- socket_server/socket_server_config.h | 2 +- ucs/clientlist.cpp | 4 ++-- ucs/ucsconfig.h | 2 +- world/EQWParser.cpp | 2 +- world/HTTPRequest.cpp | 2 +- world/LauncherLink.cpp | 2 +- world/LauncherLink.h | 2 +- world/LoginServer.h | 2 +- world/LoginServerList.h | 2 +- world/WorldConfig.h | 2 +- world/console.h | 2 +- world/net.cpp | 6 ++--- world/queryserv.cpp | 2 +- world/queryserv.h | 2 +- world/ucs.cpp | 2 +- world/ucs.h | 2 +- world/zoneserver.h | 2 +- zone/ZoneConfig.h | 2 +- zone/zone_logsys.cpp | 2 +- 55 files changed, 64 insertions(+), 69 deletions(-) rename common/{BasePacket.h => base_packet.h} (100%) rename common/{Condition.h => condition.h} (100%) rename common/{CRC16.h => crc16.h} (100%) rename common/{EmuTCPConnection.h => emu_tcp_connection.h} (100%) rename common/{EmuTCPServer.h => emu_tcp_server.h} (100%) rename common/{EQDB.h => eqdb.h} (98%) rename common/{EQDBRes.h => eqdb_res.h} (100%) rename common/{EQEmuConfig.h => eqemu_config.h} (98%) rename common/{EQEmuConfig_elements.h => eqemu_config_elements.h} (100%) diff --git a/client_files/export/main.cpp b/client_files/export/main.cpp index aca5ddc56..b5669338e 100644 --- a/client_files/export/main.cpp +++ b/client_files/export/main.cpp @@ -19,7 +19,7 @@ #include #include "../../common/debug.h" #include "../../common/shareddb.h" -#include "../../common/EQEmuConfig.h" +#include "../../common/eqemu_config.h" #include "../../common/platform.h" #include "../../common/crash.h" #include "../../common/rulesys.h" diff --git a/client_files/import/main.cpp b/client_files/import/main.cpp index 321e3a17b..3a0968d92 100644 --- a/client_files/import/main.cpp +++ b/client_files/import/main.cpp @@ -18,7 +18,7 @@ #include "../../common/debug.h" #include "../../common/shareddb.h" -#include "../../common/EQEmuConfig.h" +#include "../../common/eqemu_config.h" #include "../../common/platform.h" #include "../../common/crash.h" #include "../../common/rulesys.h" diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index fb4416868..f15e57c51 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -93,14 +93,14 @@ SET(common_sources ) SET(common_headers - BasePacket.h + base_packet.h base_data.h bodytypes.h breakdowns.h classes.h - Condition.h + condition.h crash.h - CRC16.h + crc16.h crc32.h database.h dbasync.h @@ -109,16 +109,16 @@ SET(common_headers deity.h emu_opcodes.h emu_oplist.h - EmuTCPConnection.h - EmuTCPServer.h + emu_tcp_connection.h + emu_tcp_server.h eq_constants.h eq_dictionary.h eq_packet_structs.h - EQDB.h - EQDBRes.h + eqdb.h + eqdb_res.h eqemu_exception.h - EQEmuConfig.h - EQEmuConfig_elements.h + eqemu_config.h + eqemu_config_elements.h EQEMuError.h EQPacket.h EQStream.h @@ -215,11 +215,6 @@ SET(common_headers patches/RoF_itemfields.h patches/RoF_ops.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_constants.h patches/Titanium_itemfields.h diff --git a/common/EQPacket.h b/common/EQPacket.h index 8b1f7b628..83a37da32 100644 --- a/common/EQPacket.h +++ b/common/EQPacket.h @@ -18,7 +18,7 @@ #ifndef _EQPACKET_H #define _EQPACKET_H -#include "BasePacket.h" +#include "base_packet.h" #include "EQStreamType.h" #include "op_codes.h" #include "platform.h" diff --git a/common/EQStream.h b/common/EQStream.h index 97d304642..2b32492d6 100644 --- a/common/EQStream.h +++ b/common/EQStream.h @@ -15,7 +15,7 @@ #include "Mutex.h" #include "../common/opcodemgr.h" #include "../common/misc.h" -#include "../common/Condition.h" +#include "../common/condition.h" #include "../common/timer.h" #define FLAG_COMPRESSED 0x01 diff --git a/common/EQStreamFactory.h b/common/EQStreamFactory.h index dd0b7f1b8..8e2208152 100644 --- a/common/EQStreamFactory.h +++ b/common/EQStreamFactory.h @@ -5,7 +5,7 @@ #include #include #include "../common/EQStream.h" -#include "../common/Condition.h" +#include "../common/condition.h" #include "../common/timeoutmgr.h" #include "../common/opcodemgr.h" #include "../common/timer.h" diff --git a/common/base_packet.cpp b/common/base_packet.cpp index 613e5e25a..44b3643b5 100644 --- a/common/base_packet.cpp +++ b/common/base_packet.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "debug.h" -#include "BasePacket.h" +#include "base_packet.h" #include "misc.h" #include "packet_dump.h" diff --git a/common/BasePacket.h b/common/base_packet.h similarity index 100% rename from common/BasePacket.h rename to common/base_packet.h diff --git a/common/condition.cpp b/common/condition.cpp index 7d99d0a43..2dc90b26d 100644 --- a/common/condition.cpp +++ b/common/condition.cpp @@ -17,7 +17,7 @@ */ #include "debug.h" -#include "Condition.h" +#include "condition.h" #ifdef _WINDOWS diff --git a/common/Condition.h b/common/condition.h similarity index 100% rename from common/Condition.h rename to common/condition.h diff --git a/common/CRC16.h b/common/crc16.h similarity index 100% rename from common/CRC16.h rename to common/crc16.h diff --git a/common/dbcore.h b/common/dbcore.h index 2c3602a81..e90c5e249 100644 --- a/common/dbcore.h +++ b/common/dbcore.h @@ -13,7 +13,7 @@ #include "../common/linked_list.h" #include "../common/queue.h" #include "../common/timer.h" -#include "../common/Condition.h" +#include "../common/condition.h" #include "../common/MySQLRequestResult.h" class DBcore { diff --git a/common/emu_tcp_connection.cpp b/common/emu_tcp_connection.cpp index 638825f08..41a39d3ab 100644 --- a/common/emu_tcp_connection.cpp +++ b/common/emu_tcp_connection.cpp @@ -30,8 +30,8 @@ tremendously. #include #include -#include "EmuTCPConnection.h" -#include "EmuTCPServer.h" +#include "emu_tcp_connection.h" +#include "emu_tcp_server.h" #include "../common/servertalk.h" #include "../common/packet_dump.h" diff --git a/common/EmuTCPConnection.h b/common/emu_tcp_connection.h similarity index 100% rename from common/EmuTCPConnection.h rename to common/emu_tcp_connection.h diff --git a/common/emu_tcp_server.cpp b/common/emu_tcp_server.cpp index 3549abacd..985be6edd 100644 --- a/common/emu_tcp_server.cpp +++ b/common/emu_tcp_server.cpp @@ -1,6 +1,6 @@ #include "debug.h" -#include "EmuTCPServer.h" -#include "EmuTCPConnection.h" +#include "emu_tcp_server.h" +#include "emu_tcp_connection.h" EmuTCPServer::EmuTCPServer(uint16 iPort, bool iOldFormat) : TCPServer(iPort), diff --git a/common/EmuTCPServer.h b/common/emu_tcp_server.h similarity index 100% rename from common/EmuTCPServer.h rename to common/emu_tcp_server.h diff --git a/common/eq_packet.cpp b/common/eq_packet.cpp index 36e8c83af..b2d335b41 100644 --- a/common/eq_packet.cpp +++ b/common/eq_packet.cpp @@ -22,7 +22,7 @@ #include "EQPacket.h" #include "misc.h" #include "op_codes.h" -#include "CRC16.h" +#include "crc16.h" #include "platform.h" #ifndef STATIC_OPCODE #include "opcodemgr.h" diff --git a/common/eq_stream.cpp b/common/eq_stream.cpp index 785c11ff3..473a986a7 100644 --- a/common/eq_stream.cpp +++ b/common/eq_stream.cpp @@ -22,7 +22,7 @@ #include "misc.h" #include "Mutex.h" #include "op_codes.h" -#include "CRC16.h" +#include "crc16.h" #include "platform.h" #include diff --git a/common/eqdb.cpp b/common/eqdb.cpp index 124f2e817..03746b0d4 100644 --- a/common/eqdb.cpp +++ b/common/eqdb.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "debug.h" -#include "EQDB.h" +#include "eqdb.h" #include "database.h" #include #include diff --git a/common/EQDB.h b/common/eqdb.h similarity index 98% rename from common/EQDB.h rename to common/eqdb.h index 8333d6990..b07517b69 100644 --- a/common/EQDB.h +++ b/common/eqdb.h @@ -22,7 +22,7 @@ #include #include #include "types.h" -#include "EQDBRes.h" +#include "eqdb_res.h" #include //this is the main object exported to perl. diff --git a/common/eqdb_res.cpp b/common/eqdb_res.cpp index 964746c0b..f34229a1f 100644 --- a/common/eqdb_res.cpp +++ b/common/eqdb_res.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "debug.h" -#include "EQDBRes.h" +#include "eqdb_res.h" #include std::vector EQDBRes::fetch_row_array() { diff --git a/common/EQDBRes.h b/common/eqdb_res.h similarity index 100% rename from common/EQDBRes.h rename to common/eqdb_res.h diff --git a/common/eqemu_config.cpp b/common/eqemu_config.cpp index d60d8df82..1d0dadd15 100644 --- a/common/eqemu_config.cpp +++ b/common/eqemu_config.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" -#include "EQEmuConfig.h" +#include "eqemu_config.h" #include "MiscFunctions.h" #include #include diff --git a/common/EQEmuConfig.h b/common/eqemu_config.h similarity index 98% rename from common/EQEmuConfig.h rename to common/eqemu_config.h index a3ab021a4..0a8cf833b 100644 --- a/common/EQEmuConfig.h +++ b/common/eqemu_config.h @@ -112,14 +112,14 @@ protected: #define ELEMENT(name) \ void do_##name(TiXmlElement *ele); - #include "EQEmuConfig_elements.h" + #include "eqemu_config_elements.h" EQEmuConfig() { // import the needed handler prototypes #define ELEMENT(name) \ Handlers[#name]=(ElementHandler)&EQEmuConfig::do_##name; - #include "EQEmuConfig_elements.h" + #include "eqemu_config_elements.h" // Set sane defaults diff --git a/common/EQEmuConfig_elements.h b/common/eqemu_config_elements.h similarity index 100% rename from common/EQEmuConfig_elements.h rename to common/eqemu_config_elements.h diff --git a/common/perl_eqdb.cpp b/common/perl_eqdb.cpp index 960809871..8e7fb1138 100644 --- a/common/perl_eqdb.cpp +++ b/common/perl_eqdb.cpp @@ -30,7 +30,7 @@ typedef const char Const_char; #ifdef EMBPERL #include "../common/debug.h" #include "../common/useperl.h" -#include "EQDB.h" +#include "eqdb.h" #ifdef THIS /* this macro seems to leak out on some systems */ #undef THIS diff --git a/common/perl_eqdb_res.cpp b/common/perl_eqdb_res.cpp index 15979c3a7..b4f22affb 100644 --- a/common/perl_eqdb_res.cpp +++ b/common/perl_eqdb_res.cpp @@ -30,7 +30,7 @@ typedef const char Const_char; #ifdef EMBPERL #include "../common/debug.h" #include "../common/useperl.h" -#include "EQDBRes.h" +#include "eqdb_res.h" XS(XS_EQDBRes_num_rows); /* prototype to pass -Wmissing-prototypes */ diff --git a/common/worldconn.cpp b/common/worldconn.cpp index 42375cb8a..73946d6f5 100644 --- a/common/worldconn.cpp +++ b/common/worldconn.cpp @@ -26,7 +26,7 @@ #include #include "worldconn.h" -#include "EQEmuConfig.h" +#include "eqemu_config.h" #include "md5.h" #include "database.h" #include "servertalk.h" diff --git a/common/worldconn.h b/common/worldconn.h index 08ceafb37..83d9a9cd7 100644 --- a/common/worldconn.h +++ b/common/worldconn.h @@ -19,7 +19,7 @@ #ifndef WORLDCONNECTION_H #define WORLDCONNECTION_H -#include "../common/EmuTCPConnection.h" +#include "../common/emu_tcp_connection.h" #include class ServerPacket; diff --git a/eqlaunch/ZoneLaunch.cpp b/eqlaunch/ZoneLaunch.cpp index e1332fdce..42d1debe8 100644 --- a/eqlaunch/ZoneLaunch.cpp +++ b/eqlaunch/ZoneLaunch.cpp @@ -20,7 +20,7 @@ #include "ZoneLaunch.h" #include "worldserver.h" -#include "../common/EQEmuConfig.h" +#include "../common/eqemu_config.h" //static const uint32 ZONE_RESTART_DELAY = 10000; //static const uint32 ZONE_TERMINATE_WAIT = 10000; diff --git a/eqlaunch/eqlaunch.cpp b/eqlaunch/eqlaunch.cpp index dafceaf30..58db80cb8 100644 --- a/eqlaunch/eqlaunch.cpp +++ b/eqlaunch/eqlaunch.cpp @@ -18,7 +18,7 @@ #include "../common/debug.h" #include "../common/ProcLauncher.h" -#include "../common/EQEmuConfig.h" +#include "../common/eqemu_config.h" #include "../common/servertalk.h" #include "../common/platform.h" #include "../common/crash.h" diff --git a/eqlaunch/worldserver.cpp b/eqlaunch/worldserver.cpp index c6e44fccd..5872e17d5 100644 --- a/eqlaunch/worldserver.cpp +++ b/eqlaunch/worldserver.cpp @@ -19,7 +19,7 @@ #include "worldserver.h" #include "../common/servertalk.h" #include "ZoneLaunch.h" -#include "../common/EQEmuConfig.h" +#include "../common/eqemu_config.h" #include "../common/StringUtil.h" diff --git a/loginserver/ServerManager.h b/loginserver/ServerManager.h index cf15522db..8bfd8c8ee 100644 --- a/loginserver/ServerManager.h +++ b/loginserver/ServerManager.h @@ -20,8 +20,8 @@ #include "../common/debug.h" #include "../common/EQStreamFactory.h" -#include "../common/EmuTCPConnection.h" -#include "../common/EmuTCPServer.h" +#include "../common/emu_tcp_connection.h" +#include "../common/emu_tcp_server.h" #include "../common/servertalk.h" #include "../common/packet_dump.h" #include "WorldServer.h" diff --git a/loginserver/WorldServer.h b/loginserver/WorldServer.h index 2b8b6ff61..655cbc578 100644 --- a/loginserver/WorldServer.h +++ b/loginserver/WorldServer.h @@ -20,8 +20,8 @@ #include "../common/debug.h" #include "../common/EQStreamFactory.h" -#include "../common/EmuTCPConnection.h" -#include "../common/EmuTCPServer.h" +#include "../common/emu_tcp_connection.h" +#include "../common/emu_tcp_server.h" #include "../common/servertalk.h" #include "../common/packet_dump.h" #include diff --git a/queryserv/queryservconfig.h b/queryserv/queryservconfig.h index e28f6b02a..b48ecdecd 100644 --- a/queryserv/queryservconfig.h +++ b/queryserv/queryservconfig.h @@ -20,7 +20,7 @@ #ifndef __queryservconfig_H #define __queryservconfig_H -#include "../common/EQEmuConfig.h" +#include "../common/eqemu_config.h" class queryservconfig : public EQEmuConfig { public: diff --git a/shared_memory/main.cpp b/shared_memory/main.cpp index 1c15b0a8e..8cc554441 100644 --- a/shared_memory/main.cpp +++ b/shared_memory/main.cpp @@ -19,7 +19,7 @@ #include #include "../common/debug.h" #include "../common/shareddb.h" -#include "../common/EQEmuConfig.h" +#include "../common/eqemu_config.h" #include "../common/platform.h" #include "../common/crash.h" #include "../common/rulesys.h" diff --git a/socket_server/socket_server_config.h b/socket_server/socket_server_config.h index bc86107d3..73b966ce4 100644 --- a/socket_server/socket_server_config.h +++ b/socket_server/socket_server_config.h @@ -20,7 +20,7 @@ #ifndef __socket_server_config_H #define __socket_server_config_H -#include "../common/EQEmuConfig.h" +#include "../common/eqemu_config.h" class socket_server_config : public EQEmuConfig { public: diff --git a/ucs/clientlist.cpp b/ucs/clientlist.cpp index aa019a2cc..31d54e3b5 100644 --- a/ucs/clientlist.cpp +++ b/ucs/clientlist.cpp @@ -25,8 +25,8 @@ #include "chatchannel.h" #include "../common/EQStreamFactory.h" -#include "../common/EmuTCPConnection.h" -#include "../common/EmuTCPServer.h" +#include "../common/emu_tcp_connection.h" +#include "../common/emu_tcp_server.h" #include #include #include diff --git a/ucs/ucsconfig.h b/ucs/ucsconfig.h index 6c4fb8579..23bc82a4f 100644 --- a/ucs/ucsconfig.h +++ b/ucs/ucsconfig.h @@ -20,7 +20,7 @@ #ifndef __ucsconfig_H #define __ucsconfig_H -#include "../common/EQEmuConfig.h" +#include "../common/eqemu_config.h" class ucsconfig : public EQEmuConfig { public: diff --git a/world/EQWParser.cpp b/world/EQWParser.cpp index 840c01fe3..53d430171 100644 --- a/world/EQWParser.cpp +++ b/world/EQWParser.cpp @@ -23,7 +23,7 @@ #include "../common/debug.h" #include "EQWParser.h" #include "EQW.h" -#include "../common/EQDB.h" +#include "../common/eqdb.h" #include "../common/logsys.h" #include "worlddb.h" diff --git a/world/HTTPRequest.cpp b/world/HTTPRequest.cpp index b05aa5d66..e366b6471 100644 --- a/world/HTTPRequest.cpp +++ b/world/HTTPRequest.cpp @@ -18,7 +18,7 @@ #include "../common/debug.h" #include "HTTPRequest.h" #include "EQWHTTPHandler.h" -#include "../common/EQDB.h" +#include "../common/eqdb.h" #include "../common/SocketLib/HttpdForm.h" #include diff --git a/world/LauncherLink.cpp b/world/LauncherLink.cpp index 00d93da35..de0f20384 100644 --- a/world/LauncherLink.cpp +++ b/world/LauncherLink.cpp @@ -24,7 +24,7 @@ #include "../common/md5.h" #include "../common/packet_dump.h" #include "../common/servertalk.h" -#include "../common/EmuTCPConnection.h" +#include "../common/emu_tcp_connection.h" #include "../common/StringUtil.h" #include "worlddb.h" #include "EQLConfig.h" diff --git a/world/LauncherLink.h b/world/LauncherLink.h index c5936bd3d..d1d8b6d61 100644 --- a/world/LauncherLink.h +++ b/world/LauncherLink.h @@ -18,7 +18,7 @@ #ifndef LAUNCHERLINK_H_ #define LAUNCHERLINK_H_ -#include "../common/EmuTCPConnection.h" +#include "../common/emu_tcp_connection.h" #include "../common/timer.h" #include #include diff --git a/world/LoginServer.h b/world/LoginServer.h index 6cb6957cf..45cb9c214 100644 --- a/world/LoginServer.h +++ b/world/LoginServer.h @@ -24,7 +24,7 @@ #include "../common/queue.h" #include "../common/eq_packet_structs.h" #include "../common/Mutex.h" -#include "../common/EmuTCPConnection.h" +#include "../common/emu_tcp_connection.h" class LoginServer{ public: diff --git a/world/LoginServerList.h b/world/LoginServerList.h index 29ee8ed74..f47587920 100644 --- a/world/LoginServerList.h +++ b/world/LoginServerList.h @@ -7,7 +7,7 @@ #include "../common/queue.h" #include "../common/eq_packet_structs.h" #include "../common/Mutex.h" -#include "../common/EmuTCPConnection.h" +#include "../common/emu_tcp_connection.h" #ifdef _WINDOWS void AutoInitLoginServer(void *tmp); diff --git a/world/WorldConfig.h b/world/WorldConfig.h index 316e6cfc4..4689aa08f 100644 --- a/world/WorldConfig.h +++ b/world/WorldConfig.h @@ -18,7 +18,7 @@ #ifndef __WorldConfig_H #define __WorldConfig_H -#include "../common/EQEmuConfig.h" +#include "../common/eqemu_config.h" class WorldConfig : public EQEmuConfig { public: diff --git a/world/console.h b/world/console.h index 26aa95648..3c900f0f0 100644 --- a/world/console.h +++ b/world/console.h @@ -38,7 +38,7 @@ enum { #include "../common/linked_list.h" #include "../common/timer.h" #include "../common/queue.h" -#include "../common/EmuTCPConnection.h" +#include "../common/emu_tcp_connection.h" #include "WorldTCPConnection.h" #include "../common/Mutex.h" diff --git a/world/net.cpp b/world/net.cpp index d7179bffe..663205286 100644 --- a/world/net.cpp +++ b/world/net.cpp @@ -68,15 +68,15 @@ #endif +#include "../common/dbasync.h" +#include "../common/emu_tcp_server.h" +#include "../common/patches/patches.h" #include "zoneserver.h" #include "console.h" #include "LoginServer.h" #include "LoginServerList.h" #include "EQWHTTPHandler.h" -#include "../common/dbasync.h" -#include "../common/EmuTCPServer.h" #include "WorldConfig.h" -#include "../common/patches/patches.h" #include "zoneserver.h" #include "zonelist.h" #include "clientlist.h" diff --git a/world/queryserv.cpp b/world/queryserv.cpp index eaa428332..f1e80b555 100644 --- a/world/queryserv.cpp +++ b/world/queryserv.cpp @@ -6,7 +6,7 @@ #include "../common/logsys.h" #include "../common/logtypes.h" #include "../common/md5.h" -#include "../common/EmuTCPConnection.h" +#include "../common/emu_tcp_connection.h" #include "../common/packet_dump.h" extern ClientList client_list; diff --git a/world/queryserv.h b/world/queryserv.h index df6dde7f8..5053d7c99 100644 --- a/world/queryserv.h +++ b/world/queryserv.h @@ -2,7 +2,7 @@ #define QueryServ_H #include "../common/types.h" -#include "../common/EmuTCPConnection.h" +#include "../common/emu_tcp_connection.h" #include "../common/servertalk.h" class QueryServConnection diff --git a/world/ucs.cpp b/world/ucs.cpp index 262e8c187..8e510b5f8 100644 --- a/world/ucs.cpp +++ b/world/ucs.cpp @@ -4,7 +4,7 @@ #include "../common/logsys.h" #include "../common/logtypes.h" #include "../common/md5.h" -#include "../common/EmuTCPConnection.h" +#include "../common/emu_tcp_connection.h" #include "../common/packet_dump.h" UCSConnection::UCSConnection() diff --git a/world/ucs.h b/world/ucs.h index a65d82e3d..a6e8ae032 100644 --- a/world/ucs.h +++ b/world/ucs.h @@ -2,7 +2,7 @@ #define UCS_H #include "../common/types.h" -#include "../common/EmuTCPConnection.h" +#include "../common/emu_tcp_connection.h" #include "../common/servertalk.h" class UCSConnection diff --git a/world/zoneserver.h b/world/zoneserver.h index 955c0b376..7984b4178 100644 --- a/world/zoneserver.h +++ b/world/zoneserver.h @@ -19,7 +19,7 @@ #define ZONESERVER_H #include "WorldTCPConnection.h" -#include "../common/EmuTCPConnection.h" +#include "../common/emu_tcp_connection.h" #include #include diff --git a/zone/ZoneConfig.h b/zone/ZoneConfig.h index dac5a371d..d67cb5201 100644 --- a/zone/ZoneConfig.h +++ b/zone/ZoneConfig.h @@ -18,7 +18,7 @@ #ifndef __ZoneConfig_H #define __ZoneConfig_H -#include "../common/EQEmuConfig.h" +#include "../common/eqemu_config.h" class ZoneConfig : public EQEmuConfig { public: diff --git a/zone/zone_logsys.cpp b/zone/zone_logsys.cpp index 3ecf9ec6b..59b4755dc 100644 --- a/zone/zone_logsys.cpp +++ b/zone/zone_logsys.cpp @@ -18,7 +18,7 @@ #include "../common/debug.h" #include "../common/logsys.h" -#include "../common/BasePacket.h" +#include "../common/base_packet.h" #include "mob.h" #include #include