diff --git a/world/CMakeLists.txt b/world/CMakeLists.txt index 7d4e2adeb..a9dd63478 100644 --- a/world/CMakeLists.txt +++ b/world/CMakeLists.txt @@ -1,64 +1,64 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) SET(world_sources - Adventure.cpp - AdventureManager.cpp + adventure.cpp + adventure_manager.cpp client.cpp cliententry.cpp clientlist.cpp CMakeLists.txt console.cpp - EQLConfig.cpp - EQW.cpp - EQWHTTPHandler.cpp - EQWParser.cpp - HTTPRequest.cpp - LauncherLink.cpp - LauncherList.cpp + eql_config.cpp + eqw.cpp + eqw_http_handler.cpp + eqw_parser.cpp + http_request.cpp + launcher_link.cpp + launcher_list.cpp lfplist.cpp - LoginServer.cpp - LoginServerList.cpp + login_server.cpp + login_server_list.cpp net.cpp - perl_EQLConfig.cpp - perl_EQW.cpp - perl_HTTPRequest.cpp + perl_eql_config.cpp + perl_eqw.cpp + perl_http_request.cpp queryserv.cpp ucs.cpp wguild_mgr.cpp world_logsys.cpp - WorldConfig.cpp + world_config.cpp worlddb.cpp zonelist.cpp zoneserver.cpp ) SET(world_headers - Adventure.h - AdventureManager.h - AdventureTemplate.h + adventure.h + adventure_manager.h + adventure_template.h client.h cliententry.h clientlist.h CMakeLists.txt console.h - EQLConfig.h - EQW.h - EQWHTTPHandler.h - EQWParser.h - HTTPRequest.h - LauncherLink.h - LauncherList.h + eql_config.h + eqw.h + eqw_http_handler.h + eqw_parser.h + http_request.h + launcher_link.h + launcher_list.h lfplist.h - LoginServer.h - LoginServerList.h + login_server.h + login_server_list.h net.h queryserv.h - sofCharCreateData.h + sof_char_create_data.h ucs.h wguild_mgr.h - WorldConfig.h + world_config.h worlddb.h - WorldTCPConnection.h + world_tcp_connection.h zonelist.h zoneserver.h ) diff --git a/world/Adventure.cpp b/world/adventure.cpp similarity index 99% rename from world/Adventure.cpp rename to world/adventure.cpp index b66735176..45dd206e5 100644 --- a/world/Adventure.cpp +++ b/world/adventure.cpp @@ -4,8 +4,8 @@ #include "../common/rulesys.h" #include "../common/misc_functions.h" #include "../common/string_util.h" -#include "Adventure.h" -#include "AdventureManager.h" +#include "adventure.h" +#include "adventure_manager.h" #include "worlddb.h" #include "zonelist.h" #include "clientlist.h" diff --git a/world/Adventure.h b/world/adventure.h similarity index 98% rename from world/Adventure.h rename to world/adventure.h index cb14609ae..dec691eda 100644 --- a/world/Adventure.h +++ b/world/adventure.h @@ -4,7 +4,7 @@ #include "../common/debug.h" #include "../common/types.h" #include "../common/timer.h" -#include "AdventureTemplate.h" +#include "adventure_template.h" #include #include #include diff --git a/world/AdventureManager.cpp b/world/adventure_manager.cpp similarity index 99% rename from world/AdventureManager.cpp rename to world/adventure_manager.cpp index 33ac522b8..047aca326 100644 --- a/world/AdventureManager.cpp +++ b/world/adventure_manager.cpp @@ -3,8 +3,8 @@ #include "../common/string_util.h" #include "../common/servertalk.h" #include "../common/rulesys.h" -#include "Adventure.h" -#include "AdventureManager.h" +#include "adventure.h" +#include "adventure_manager.h" #include "worlddb.h" #include "zonelist.h" #include "clientlist.h" diff --git a/world/AdventureManager.h b/world/adventure_manager.h similarity index 98% rename from world/AdventureManager.h rename to world/adventure_manager.h index e7055ac8d..ce6d7331a 100644 --- a/world/AdventureManager.h +++ b/world/adventure_manager.h @@ -4,8 +4,8 @@ #include "../common/debug.h" #include "../common/types.h" #include "../common/timer.h" -#include "Adventure.h" -#include "AdventureTemplate.h" +#include "adventure.h" +#include "adventure_template.h" #include #include diff --git a/world/AdventureTemplate.h b/world/adventure_template.h similarity index 100% rename from world/AdventureTemplate.h rename to world/adventure_template.h diff --git a/world/client.cpp b/world/client.cpp index 150d6a9c9..fc7e525db 100644 --- a/world/client.cpp +++ b/world/client.cpp @@ -18,14 +18,14 @@ #include "client.h" #include "worlddb.h" -#include "WorldConfig.h" -#include "LoginServer.h" -#include "LoginServerList.h" +#include "world_config.h" +#include "login_server.h" +#include "login_server_list.h" #include "zoneserver.h" #include "zonelist.h" #include "clientlist.h" #include "wguild_mgr.h" -#include "sofCharCreateData.h" +#include "sof_char_create_data.h" #include #include diff --git a/world/cliententry.cpp b/world/cliententry.cpp index 131fceb3d..d4b85acc3 100644 --- a/world/cliententry.cpp +++ b/world/cliententry.cpp @@ -18,11 +18,11 @@ #include "../common/debug.h" #include "cliententry.h" #include "clientlist.h" -#include "LoginServer.h" -#include "LoginServerList.h" +#include "login_server.h" +#include "login_server_list.h" #include "worlddb.h" #include "zoneserver.h" -#include "WorldConfig.h" +#include "world_config.h" #include "../common/guilds.h" #include "../common/string_util.h" diff --git a/world/console.cpp b/world/console.cpp index e46a880e8..d5433067e 100644 --- a/world/console.cpp +++ b/world/console.cpp @@ -31,19 +31,19 @@ #include "../common/seperator.h" #include "../common/eq_packet_structs.h" #include "../common/eq_packet.h" -#include "LoginServer.h" -#include "LoginServerList.h" +#include "login_server.h" +#include "login_server_list.h" #include "../common/serverinfo.h" #include "../common/md5.h" #include "../common/opcodemgr.h" #include "../common/rulesys.h" #include "../common/ruletypes.h" #include "../common/string_util.h" -#include "WorldConfig.h" +#include "world_config.h" #include "zoneserver.h" #include "zonelist.h" #include "clientlist.h" -#include "LauncherList.h" +#include "launcher_list.h" #include "ucs.h" #include "queryserv.h" diff --git a/world/console.h b/world/console.h index 0588d8598..e0a72f590 100644 --- a/world/console.h +++ b/world/console.h @@ -39,7 +39,7 @@ enum { #include "../common/timer.h" #include "../common/queue.h" #include "../common/emu_tcp_connection.h" -#include "WorldTCPConnection.h" +#include "world_tcp_connection.h" #include "../common/mutex.h" struct ServerChannelMessage_Struct; diff --git a/world/EQLConfig.cpp b/world/eql_config.cpp similarity index 99% rename from world/EQLConfig.cpp rename to world/eql_config.cpp index c89c90428..f99ba0fb6 100644 --- a/world/EQLConfig.cpp +++ b/world/eql_config.cpp @@ -16,10 +16,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" -#include "EQLConfig.h" +#include "eql_config.h" #include "worlddb.h" -#include "LauncherLink.h" -#include "LauncherList.h" +#include "launcher_link.h" +#include "launcher_list.h" #include "../common/string_util.h" #include #include diff --git a/world/EQLConfig.h b/world/eql_config.h similarity index 100% rename from world/EQLConfig.h rename to world/eql_config.h diff --git a/world/EQW.cpp b/world/eqw.cpp similarity index 98% rename from world/EQW.cpp rename to world/eqw.cpp index 8ff7ac298..343aa9ebd 100644 --- a/world/EQW.cpp +++ b/world/eqw.cpp @@ -19,9 +19,9 @@ #ifdef EMBPERL #include "../common/debug.h" -#include "EQW.h" -#include "EQWParser.h" -#include "WorldConfig.h" +#include "eqw.h" +#include "eqw_parser.h" +#include "world_config.h" #include "../common/races.h" #include "../common/classes.h" #include "../common/misc.h" @@ -30,12 +30,12 @@ #include "zonelist.h" #include "clientlist.h" #include "cliententry.h" -#include "LoginServer.h" -#include "LoginServerList.h" +#include "login_server.h" +#include "login_server_list.h" #include "worlddb.h" #include "client.h" -#include "LauncherList.h" -#include "LauncherLink.h" +#include "launcher_list.h" +#include "launcher_link.h" #include "wguild_mgr.h" #ifdef seed diff --git a/world/EQW.h b/world/eqw.h similarity index 100% rename from world/EQW.h rename to world/eqw.h diff --git a/world/EQWHTTPHandler.cpp b/world/eqw_http_handler.cpp similarity index 98% rename from world/EQWHTTPHandler.cpp rename to world/eqw_http_handler.cpp index f3126e6a3..6a703172a 100644 --- a/world/EQWHTTPHandler.cpp +++ b/world/eqw_http_handler.cpp @@ -16,11 +16,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" -#include "EQWHTTPHandler.h" +#include "eqw_http_handler.h" #include "../common/SocketLib/Base64.h" -#include "EQWParser.h" -#include "EQW.h" -#include "HTTPRequest.h" +#include "eqw_parser.h" +#include "eqw.h" +#include "http_request.h" #include "../common/logsys.h" #include "worlddb.h" #include "console.h" diff --git a/world/EQWHTTPHandler.h b/world/eqw_http_handler.h similarity index 100% rename from world/EQWHTTPHandler.h rename to world/eqw_http_handler.h diff --git a/world/EQWParser.cpp b/world/eqw_parser.cpp similarity index 99% rename from world/EQWParser.cpp rename to world/eqw_parser.cpp index 53d430171..9aa372308 100644 --- a/world/EQWParser.cpp +++ b/world/eqw_parser.cpp @@ -21,8 +21,8 @@ #ifdef EMBPERL #include "../common/debug.h" -#include "EQWParser.h" -#include "EQW.h" +#include "eqw_parser.h" +#include "eqw.h" #include "../common/eqdb.h" #include "../common/logsys.h" #include "worlddb.h" diff --git a/world/EQWParser.h b/world/eqw_parser.h similarity index 100% rename from world/EQWParser.h rename to world/eqw_parser.h diff --git a/world/HTTPRequest.cpp b/world/http_request.cpp similarity index 97% rename from world/HTTPRequest.cpp rename to world/http_request.cpp index e366b6471..fa7bc78f1 100644 --- a/world/HTTPRequest.cpp +++ b/world/http_request.cpp @@ -16,8 +16,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" -#include "HTTPRequest.h" -#include "EQWHTTPHandler.h" +#include "http_request.h" +#include "eqw_http_handler.h" #include "../common/eqdb.h" #include "../common/SocketLib/HttpdForm.h" #include diff --git a/world/HTTPRequest.h b/world/http_request.h similarity index 100% rename from world/HTTPRequest.h rename to world/http_request.h diff --git a/world/LauncherLink.cpp b/world/launcher_link.cpp similarity index 98% rename from world/LauncherLink.cpp rename to world/launcher_link.cpp index 3b2463880..180e742a5 100644 --- a/world/LauncherLink.cpp +++ b/world/launcher_link.cpp @@ -17,9 +17,9 @@ */ #include "../common/debug.h" -#include "LauncherLink.h" -#include "LauncherList.h" -#include "WorldConfig.h" +#include "launcher_link.h" +#include "launcher_list.h" +#include "world_config.h" #include "../common/logsys.h" #include "../common/md5.h" #include "../common/packet_dump.h" @@ -27,7 +27,7 @@ #include "../common/emu_tcp_connection.h" #include "../common/string_util.h" #include "worlddb.h" -#include "EQLConfig.h" +#include "eql_config.h" #include #include diff --git a/world/LauncherLink.h b/world/launcher_link.h similarity index 100% rename from world/LauncherLink.h rename to world/launcher_link.h diff --git a/world/LauncherList.cpp b/world/launcher_list.cpp similarity index 98% rename from world/LauncherList.cpp rename to world/launcher_list.cpp index f22476343..9c3bada2b 100644 --- a/world/LauncherList.cpp +++ b/world/launcher_list.cpp @@ -18,10 +18,10 @@ #include "../common/debug.h" -#include "LauncherList.h" -#include "LauncherLink.h" +#include "launcher_list.h" +#include "launcher_link.h" #include "../common/logsys.h" -#include "EQLConfig.h" +#include "eql_config.h" LauncherList::LauncherList() : nextID(1) diff --git a/world/LauncherList.h b/world/launcher_list.h similarity index 100% rename from world/LauncherList.h rename to world/launcher_list.h diff --git a/world/LoginServer.cpp b/world/login_server.cpp similarity index 99% rename from world/LoginServer.cpp rename to world/login_server.cpp index 3b4781a2a..83f432ca0 100644 --- a/world/LoginServer.cpp +++ b/world/login_server.cpp @@ -52,8 +52,8 @@ #define IGNORE_LS_FATAL_ERROR #include "../common/servertalk.h" -#include "LoginServer.h" -#include "LoginServerList.h" +#include "login_server.h" +#include "login_server_list.h" #include "../common/eq_packet_structs.h" #include "../common/packet_dump.h" #include "../common/string_util.h" @@ -61,7 +61,7 @@ #include "worlddb.h" #include "zonelist.h" #include "clientlist.h" -#include "WorldConfig.h" +#include "world_config.h" extern ZSList zoneserver_list; extern ClientList client_list; diff --git a/world/LoginServer.h b/world/login_server.h similarity index 100% rename from world/LoginServer.h rename to world/login_server.h diff --git a/world/LoginServerList.cpp b/world/login_server_list.cpp similarity index 98% rename from world/LoginServerList.cpp rename to world/login_server_list.cpp index 5316804de..8e3780463 100644 --- a/world/LoginServerList.cpp +++ b/world/login_server_list.cpp @@ -26,15 +26,15 @@ #define IGNORE_LS_FATAL_ERROR #include "../common/servertalk.h" -#include "LoginServer.h" -#include "LoginServerList.h" +#include "login_server.h" +#include "login_server_list.h" #include "../common/eq_packet_structs.h" #include "../common/packet_dump.h" #include "zoneserver.h" #include "worlddb.h" #include "zonelist.h" #include "clientlist.h" -#include "WorldConfig.h" +#include "world_config.h" extern ZSList zoneserver_list; extern LoginServerList loginserverlist; diff --git a/world/LoginServerList.h b/world/login_server_list.h similarity index 100% rename from world/LoginServerList.h rename to world/login_server_list.h diff --git a/world/net.cpp b/world/net.cpp index 885d27c7d..4bfdc3c1a 100644 --- a/world/net.cpp +++ b/world/net.cpp @@ -72,17 +72,17 @@ #include "../common/patches/patches.h" #include "zoneserver.h" #include "console.h" -#include "LoginServer.h" -#include "LoginServerList.h" -#include "EQWHTTPHandler.h" -#include "WorldConfig.h" +#include "login_server.h" +#include "login_server_list.h" +#include "eqw_http_handler.h" +#include "world_config.h" #include "zoneserver.h" #include "zonelist.h" #include "clientlist.h" -#include "LauncherList.h" +#include "launcher_list.h" #include "wguild_mgr.h" #include "lfplist.h" -#include "AdventureManager.h" +#include "adventure_manager.h" #include "ucs.h" #include "queryserv.h" diff --git a/world/perl_EQLConfig.cpp b/world/perl_eql_config.cpp similarity index 99% rename from world/perl_EQLConfig.cpp rename to world/perl_eql_config.cpp index 5179839a6..19ea7c9f6 100644 --- a/world/perl_EQLConfig.cpp +++ b/world/perl_eql_config.cpp @@ -29,8 +29,8 @@ typedef const char Const_char; #ifdef EMBPERL #include "../common/debug.h" -#include "EQWParser.h" -#include "EQLConfig.h" +#include "eqw_parser.h" +#include "eql_config.h" #ifdef seed #undef seed diff --git a/world/perl_EQW.cpp b/world/perl_eqw.cpp similarity index 99% rename from world/perl_EQW.cpp rename to world/perl_eqw.cpp index e6896a08c..0a564164d 100644 --- a/world/perl_EQW.cpp +++ b/world/perl_eqw.cpp @@ -29,8 +29,8 @@ typedef const char Const_char; #ifdef EMBPERL #include "../common/debug.h" -#include "EQWParser.h" -#include "EQW.h" +#include "eqw_parser.h" +#include "eqw.h" #ifdef seed #undef seed diff --git a/world/perl_HTTPRequest.cpp b/world/perl_http_request.cpp similarity index 99% rename from world/perl_HTTPRequest.cpp rename to world/perl_http_request.cpp index 54fa48780..12d70002c 100644 --- a/world/perl_HTTPRequest.cpp +++ b/world/perl_http_request.cpp @@ -29,8 +29,8 @@ typedef const char Const_char; #ifdef EMBPERL #include "../common/debug.h" -#include "EQWParser.h" -#include "HTTPRequest.h" +#include "eqw_parser.h" +#include "http_request.h" #ifdef seed #undef seed diff --git a/world/queryserv.cpp b/world/queryserv.cpp index f1e80b555..2539fff63 100644 --- a/world/queryserv.cpp +++ b/world/queryserv.cpp @@ -1,6 +1,6 @@ #include "../common/debug.h" #include "queryserv.h" -#include "WorldConfig.h" +#include "world_config.h" #include "clientlist.h" #include "zonelist.h" #include "../common/logsys.h" diff --git a/world/SoFCharCreateData.h b/world/sof_char_create_data.h similarity index 100% rename from world/SoFCharCreateData.h rename to world/sof_char_create_data.h diff --git a/world/ucs.cpp b/world/ucs.cpp index 8e510b5f8..f89874ae2 100644 --- a/world/ucs.cpp +++ b/world/ucs.cpp @@ -1,6 +1,6 @@ #include "../common/debug.h" #include "ucs.h" -#include "WorldConfig.h" +#include "world_config.h" #include "../common/logsys.h" #include "../common/logtypes.h" #include "../common/md5.h" diff --git a/world/WorldConfig.cpp b/world/world_config.cpp similarity index 97% rename from world/WorldConfig.cpp rename to world/world_config.cpp index 96313ded3..2f9464e13 100644 --- a/world/WorldConfig.cpp +++ b/world/world_config.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" -#include "WorldConfig.h" +#include "world_config.h" WorldConfig *WorldConfig::_world_config = nullptr; diff --git a/world/WorldConfig.h b/world/world_config.h similarity index 100% rename from world/WorldConfig.h rename to world/world_config.h diff --git a/world/WorldTCPConnection.h b/world/world_tcp_connection.h similarity index 100% rename from world/WorldTCPConnection.h rename to world/world_tcp_connection.h diff --git a/world/worlddb.cpp b/world/worlddb.cpp index e6c3492e9..7a07c6f6f 100644 --- a/world/worlddb.cpp +++ b/world/worlddb.cpp @@ -26,7 +26,7 @@ #include #include #include -#include "sofCharCreateData.h" +#include "sof_char_create_data.h" WorldDatabase database; extern std::vector character_create_allocations; diff --git a/world/zonelist.cpp b/world/zonelist.cpp index 6b82c0fe9..fdf9db5cf 100644 --- a/world/zonelist.cpp +++ b/world/zonelist.cpp @@ -18,10 +18,10 @@ #include "../common/debug.h" #include "zonelist.h" #include "zoneserver.h" -#include "WorldTCPConnection.h" +#include "world_tcp_connection.h" #include "worlddb.h" #include "console.h" -#include "WorldConfig.h" +#include "world_config.h" #include "../common/servertalk.h" #include "../common/string_util.h" diff --git a/world/zoneserver.cpp b/world/zoneserver.cpp index 6f8833bd1..a719deecf 100644 --- a/world/zoneserver.cpp +++ b/world/zoneserver.cpp @@ -18,14 +18,14 @@ #include "../common/debug.h" #include "zoneserver.h" #include "clientlist.h" -#include "LoginServer.h" -#include "LoginServerList.h" +#include "login_server.h" +#include "login_server_list.h" #include "zonelist.h" #include "worlddb.h" #include "console.h" #include "client.h" #include "../common/md5.h" -#include "WorldConfig.h" +#include "world_config.h" #include "../common/guilds.h" #include "../common/packet_dump.h" #include "../common/misc.h" @@ -33,7 +33,7 @@ #include "cliententry.h" #include "wguild_mgr.h" #include "lfplist.h" -#include "AdventureManager.h" +#include "adventure_manager.h" #include "ucs.h" #include "queryserv.h" diff --git a/world/zoneserver.h b/world/zoneserver.h index 7984b4178..661e03019 100644 --- a/world/zoneserver.h +++ b/world/zoneserver.h @@ -18,7 +18,7 @@ #ifndef ZONESERVER_H #define ZONESERVER_H -#include "WorldTCPConnection.h" +#include "world_tcp_connection.h" #include "../common/emu_tcp_connection.h" #include #include