More renames, world should be done

This commit is contained in:
KimLS 2014-08-21 23:30:09 -07:00
parent 5bf49d2ef9
commit 4821ed79fb
42 changed files with 103 additions and 103 deletions

View File

@ -1,64 +1,64 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8) CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
SET(world_sources SET(world_sources
Adventure.cpp adventure.cpp
AdventureManager.cpp adventure_manager.cpp
client.cpp client.cpp
cliententry.cpp cliententry.cpp
clientlist.cpp clientlist.cpp
CMakeLists.txt CMakeLists.txt
console.cpp console.cpp
EQLConfig.cpp eql_config.cpp
EQW.cpp eqw.cpp
EQWHTTPHandler.cpp eqw_http_handler.cpp
EQWParser.cpp eqw_parser.cpp
HTTPRequest.cpp http_request.cpp
LauncherLink.cpp launcher_link.cpp
LauncherList.cpp launcher_list.cpp
lfplist.cpp lfplist.cpp
LoginServer.cpp login_server.cpp
LoginServerList.cpp login_server_list.cpp
net.cpp net.cpp
perl_EQLConfig.cpp perl_eql_config.cpp
perl_EQW.cpp perl_eqw.cpp
perl_HTTPRequest.cpp perl_http_request.cpp
queryserv.cpp queryserv.cpp
ucs.cpp ucs.cpp
wguild_mgr.cpp wguild_mgr.cpp
world_logsys.cpp world_logsys.cpp
WorldConfig.cpp world_config.cpp
worlddb.cpp worlddb.cpp
zonelist.cpp zonelist.cpp
zoneserver.cpp zoneserver.cpp
) )
SET(world_headers SET(world_headers
Adventure.h adventure.h
AdventureManager.h adventure_manager.h
AdventureTemplate.h adventure_template.h
client.h client.h
cliententry.h cliententry.h
clientlist.h clientlist.h
CMakeLists.txt CMakeLists.txt
console.h console.h
EQLConfig.h eql_config.h
EQW.h eqw.h
EQWHTTPHandler.h eqw_http_handler.h
EQWParser.h eqw_parser.h
HTTPRequest.h http_request.h
LauncherLink.h launcher_link.h
LauncherList.h launcher_list.h
lfplist.h lfplist.h
LoginServer.h login_server.h
LoginServerList.h login_server_list.h
net.h net.h
queryserv.h queryserv.h
sofCharCreateData.h sof_char_create_data.h
ucs.h ucs.h
wguild_mgr.h wguild_mgr.h
WorldConfig.h world_config.h
worlddb.h worlddb.h
WorldTCPConnection.h world_tcp_connection.h
zonelist.h zonelist.h
zoneserver.h zoneserver.h
) )

View File

@ -4,8 +4,8 @@
#include "../common/rulesys.h" #include "../common/rulesys.h"
#include "../common/misc_functions.h" #include "../common/misc_functions.h"
#include "../common/string_util.h" #include "../common/string_util.h"
#include "Adventure.h" #include "adventure.h"
#include "AdventureManager.h" #include "adventure_manager.h"
#include "worlddb.h" #include "worlddb.h"
#include "zonelist.h" #include "zonelist.h"
#include "clientlist.h" #include "clientlist.h"

View File

@ -4,7 +4,7 @@
#include "../common/debug.h" #include "../common/debug.h"
#include "../common/types.h" #include "../common/types.h"
#include "../common/timer.h" #include "../common/timer.h"
#include "AdventureTemplate.h" #include "adventure_template.h"
#include <list> #include <list>
#include <string> #include <string>
#include <stdlib.h> #include <stdlib.h>

View File

@ -3,8 +3,8 @@
#include "../common/string_util.h" #include "../common/string_util.h"
#include "../common/servertalk.h" #include "../common/servertalk.h"
#include "../common/rulesys.h" #include "../common/rulesys.h"
#include "Adventure.h" #include "adventure.h"
#include "AdventureManager.h" #include "adventure_manager.h"
#include "worlddb.h" #include "worlddb.h"
#include "zonelist.h" #include "zonelist.h"
#include "clientlist.h" #include "clientlist.h"

View File

@ -4,8 +4,8 @@
#include "../common/debug.h" #include "../common/debug.h"
#include "../common/types.h" #include "../common/types.h"
#include "../common/timer.h" #include "../common/timer.h"
#include "Adventure.h" #include "adventure.h"
#include "AdventureTemplate.h" #include "adventure_template.h"
#include <map> #include <map>
#include <list> #include <list>

View File

@ -18,14 +18,14 @@
#include "client.h" #include "client.h"
#include "worlddb.h" #include "worlddb.h"
#include "WorldConfig.h" #include "world_config.h"
#include "LoginServer.h" #include "login_server.h"
#include "LoginServerList.h" #include "login_server_list.h"
#include "zoneserver.h" #include "zoneserver.h"
#include "zonelist.h" #include "zonelist.h"
#include "clientlist.h" #include "clientlist.h"
#include "wguild_mgr.h" #include "wguild_mgr.h"
#include "sofCharCreateData.h" #include "sof_char_create_data.h"
#include <iostream> #include <iostream>
#include <iomanip> #include <iomanip>

View File

@ -18,11 +18,11 @@
#include "../common/debug.h" #include "../common/debug.h"
#include "cliententry.h" #include "cliententry.h"
#include "clientlist.h" #include "clientlist.h"
#include "LoginServer.h" #include "login_server.h"
#include "LoginServerList.h" #include "login_server_list.h"
#include "worlddb.h" #include "worlddb.h"
#include "zoneserver.h" #include "zoneserver.h"
#include "WorldConfig.h" #include "world_config.h"
#include "../common/guilds.h" #include "../common/guilds.h"
#include "../common/string_util.h" #include "../common/string_util.h"

View File

@ -31,19 +31,19 @@
#include "../common/seperator.h" #include "../common/seperator.h"
#include "../common/eq_packet_structs.h" #include "../common/eq_packet_structs.h"
#include "../common/eq_packet.h" #include "../common/eq_packet.h"
#include "LoginServer.h" #include "login_server.h"
#include "LoginServerList.h" #include "login_server_list.h"
#include "../common/serverinfo.h" #include "../common/serverinfo.h"
#include "../common/md5.h" #include "../common/md5.h"
#include "../common/opcodemgr.h" #include "../common/opcodemgr.h"
#include "../common/rulesys.h" #include "../common/rulesys.h"
#include "../common/ruletypes.h" #include "../common/ruletypes.h"
#include "../common/string_util.h" #include "../common/string_util.h"
#include "WorldConfig.h" #include "world_config.h"
#include "zoneserver.h" #include "zoneserver.h"
#include "zonelist.h" #include "zonelist.h"
#include "clientlist.h" #include "clientlist.h"
#include "LauncherList.h" #include "launcher_list.h"
#include "ucs.h" #include "ucs.h"
#include "queryserv.h" #include "queryserv.h"

View File

@ -39,7 +39,7 @@ enum {
#include "../common/timer.h" #include "../common/timer.h"
#include "../common/queue.h" #include "../common/queue.h"
#include "../common/emu_tcp_connection.h" #include "../common/emu_tcp_connection.h"
#include "WorldTCPConnection.h" #include "world_tcp_connection.h"
#include "../common/mutex.h" #include "../common/mutex.h"
struct ServerChannelMessage_Struct; struct ServerChannelMessage_Struct;

View File

@ -16,10 +16,10 @@
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 "EQLConfig.h" #include "eql_config.h"
#include "worlddb.h" #include "worlddb.h"
#include "LauncherLink.h" #include "launcher_link.h"
#include "LauncherList.h" #include "launcher_list.h"
#include "../common/string_util.h" #include "../common/string_util.h"
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>

View File

@ -19,9 +19,9 @@
#ifdef EMBPERL #ifdef EMBPERL
#include "../common/debug.h" #include "../common/debug.h"
#include "EQW.h" #include "eqw.h"
#include "EQWParser.h" #include "eqw_parser.h"
#include "WorldConfig.h" #include "world_config.h"
#include "../common/races.h" #include "../common/races.h"
#include "../common/classes.h" #include "../common/classes.h"
#include "../common/misc.h" #include "../common/misc.h"
@ -30,12 +30,12 @@
#include "zonelist.h" #include "zonelist.h"
#include "clientlist.h" #include "clientlist.h"
#include "cliententry.h" #include "cliententry.h"
#include "LoginServer.h" #include "login_server.h"
#include "LoginServerList.h" #include "login_server_list.h"
#include "worlddb.h" #include "worlddb.h"
#include "client.h" #include "client.h"
#include "LauncherList.h" #include "launcher_list.h"
#include "LauncherLink.h" #include "launcher_link.h"
#include "wguild_mgr.h" #include "wguild_mgr.h"
#ifdef seed #ifdef seed

View File

@ -16,11 +16,11 @@
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 "EQWHTTPHandler.h" #include "eqw_http_handler.h"
#include "../common/SocketLib/Base64.h" #include "../common/SocketLib/Base64.h"
#include "EQWParser.h" #include "eqw_parser.h"
#include "EQW.h" #include "eqw.h"
#include "HTTPRequest.h" #include "http_request.h"
#include "../common/logsys.h" #include "../common/logsys.h"
#include "worlddb.h" #include "worlddb.h"
#include "console.h" #include "console.h"

View File

@ -21,8 +21,8 @@
#ifdef EMBPERL #ifdef EMBPERL
#include "../common/debug.h" #include "../common/debug.h"
#include "EQWParser.h" #include "eqw_parser.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"

View File

@ -16,8 +16,8 @@
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 "HTTPRequest.h" #include "http_request.h"
#include "EQWHTTPHandler.h" #include "eqw_http_handler.h"
#include "../common/eqdb.h" #include "../common/eqdb.h"
#include "../common/SocketLib/HttpdForm.h" #include "../common/SocketLib/HttpdForm.h"
#include <cstdlib> #include <cstdlib>

View File

@ -17,9 +17,9 @@
*/ */
#include "../common/debug.h" #include "../common/debug.h"
#include "LauncherLink.h" #include "launcher_link.h"
#include "LauncherList.h" #include "launcher_list.h"
#include "WorldConfig.h" #include "world_config.h"
#include "../common/logsys.h" #include "../common/logsys.h"
#include "../common/md5.h" #include "../common/md5.h"
#include "../common/packet_dump.h" #include "../common/packet_dump.h"
@ -27,7 +27,7 @@
#include "../common/emu_tcp_connection.h" #include "../common/emu_tcp_connection.h"
#include "../common/string_util.h" #include "../common/string_util.h"
#include "worlddb.h" #include "worlddb.h"
#include "EQLConfig.h" #include "eql_config.h"
#include <vector> #include <vector>
#include <string> #include <string>

View File

@ -18,10 +18,10 @@
#include "../common/debug.h" #include "../common/debug.h"
#include "LauncherList.h" #include "launcher_list.h"
#include "LauncherLink.h" #include "launcher_link.h"
#include "../common/logsys.h" #include "../common/logsys.h"
#include "EQLConfig.h" #include "eql_config.h"
LauncherList::LauncherList() LauncherList::LauncherList()
: nextID(1) : nextID(1)

View File

@ -52,8 +52,8 @@
#define IGNORE_LS_FATAL_ERROR #define IGNORE_LS_FATAL_ERROR
#include "../common/servertalk.h" #include "../common/servertalk.h"
#include "LoginServer.h" #include "login_server.h"
#include "LoginServerList.h" #include "login_server_list.h"
#include "../common/eq_packet_structs.h" #include "../common/eq_packet_structs.h"
#include "../common/packet_dump.h" #include "../common/packet_dump.h"
#include "../common/string_util.h" #include "../common/string_util.h"
@ -61,7 +61,7 @@
#include "worlddb.h" #include "worlddb.h"
#include "zonelist.h" #include "zonelist.h"
#include "clientlist.h" #include "clientlist.h"
#include "WorldConfig.h" #include "world_config.h"
extern ZSList zoneserver_list; extern ZSList zoneserver_list;
extern ClientList client_list; extern ClientList client_list;

View File

@ -26,15 +26,15 @@
#define IGNORE_LS_FATAL_ERROR #define IGNORE_LS_FATAL_ERROR
#include "../common/servertalk.h" #include "../common/servertalk.h"
#include "LoginServer.h" #include "login_server.h"
#include "LoginServerList.h" #include "login_server_list.h"
#include "../common/eq_packet_structs.h" #include "../common/eq_packet_structs.h"
#include "../common/packet_dump.h" #include "../common/packet_dump.h"
#include "zoneserver.h" #include "zoneserver.h"
#include "worlddb.h" #include "worlddb.h"
#include "zonelist.h" #include "zonelist.h"
#include "clientlist.h" #include "clientlist.h"
#include "WorldConfig.h" #include "world_config.h"
extern ZSList zoneserver_list; extern ZSList zoneserver_list;
extern LoginServerList loginserverlist; extern LoginServerList loginserverlist;

View File

@ -72,17 +72,17 @@
#include "../common/patches/patches.h" #include "../common/patches/patches.h"
#include "zoneserver.h" #include "zoneserver.h"
#include "console.h" #include "console.h"
#include "LoginServer.h" #include "login_server.h"
#include "LoginServerList.h" #include "login_server_list.h"
#include "EQWHTTPHandler.h" #include "eqw_http_handler.h"
#include "WorldConfig.h" #include "world_config.h"
#include "zoneserver.h" #include "zoneserver.h"
#include "zonelist.h" #include "zonelist.h"
#include "clientlist.h" #include "clientlist.h"
#include "LauncherList.h" #include "launcher_list.h"
#include "wguild_mgr.h" #include "wguild_mgr.h"
#include "lfplist.h" #include "lfplist.h"
#include "AdventureManager.h" #include "adventure_manager.h"
#include "ucs.h" #include "ucs.h"
#include "queryserv.h" #include "queryserv.h"

View File

@ -29,8 +29,8 @@ typedef const char Const_char;
#ifdef EMBPERL #ifdef EMBPERL
#include "../common/debug.h" #include "../common/debug.h"
#include "EQWParser.h" #include "eqw_parser.h"
#include "EQLConfig.h" #include "eql_config.h"
#ifdef seed #ifdef seed
#undef seed #undef seed

View File

@ -29,8 +29,8 @@ typedef const char Const_char;
#ifdef EMBPERL #ifdef EMBPERL
#include "../common/debug.h" #include "../common/debug.h"
#include "EQWParser.h" #include "eqw_parser.h"
#include "EQW.h" #include "eqw.h"
#ifdef seed #ifdef seed
#undef seed #undef seed

View File

@ -29,8 +29,8 @@ typedef const char Const_char;
#ifdef EMBPERL #ifdef EMBPERL
#include "../common/debug.h" #include "../common/debug.h"
#include "EQWParser.h" #include "eqw_parser.h"
#include "HTTPRequest.h" #include "http_request.h"
#ifdef seed #ifdef seed
#undef seed #undef seed

View File

@ -1,6 +1,6 @@
#include "../common/debug.h" #include "../common/debug.h"
#include "queryserv.h" #include "queryserv.h"
#include "WorldConfig.h" #include "world_config.h"
#include "clientlist.h" #include "clientlist.h"
#include "zonelist.h" #include "zonelist.h"
#include "../common/logsys.h" #include "../common/logsys.h"

View File

@ -1,6 +1,6 @@
#include "../common/debug.h" #include "../common/debug.h"
#include "ucs.h" #include "ucs.h"
#include "WorldConfig.h" #include "world_config.h"
#include "../common/logsys.h" #include "../common/logsys.h"
#include "../common/logtypes.h" #include "../common/logtypes.h"
#include "../common/md5.h" #include "../common/md5.h"

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 "WorldConfig.h" #include "world_config.h"
WorldConfig *WorldConfig::_world_config = nullptr; WorldConfig *WorldConfig::_world_config = nullptr;

View File

@ -26,7 +26,7 @@
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <vector> #include <vector>
#include "sofCharCreateData.h" #include "sof_char_create_data.h"
WorldDatabase database; WorldDatabase database;
extern std::vector<RaceClassAllocation> character_create_allocations; extern std::vector<RaceClassAllocation> character_create_allocations;

View File

@ -18,10 +18,10 @@
#include "../common/debug.h" #include "../common/debug.h"
#include "zonelist.h" #include "zonelist.h"
#include "zoneserver.h" #include "zoneserver.h"
#include "WorldTCPConnection.h" #include "world_tcp_connection.h"
#include "worlddb.h" #include "worlddb.h"
#include "console.h" #include "console.h"
#include "WorldConfig.h" #include "world_config.h"
#include "../common/servertalk.h" #include "../common/servertalk.h"
#include "../common/string_util.h" #include "../common/string_util.h"

View File

@ -18,14 +18,14 @@
#include "../common/debug.h" #include "../common/debug.h"
#include "zoneserver.h" #include "zoneserver.h"
#include "clientlist.h" #include "clientlist.h"
#include "LoginServer.h" #include "login_server.h"
#include "LoginServerList.h" #include "login_server_list.h"
#include "zonelist.h" #include "zonelist.h"
#include "worlddb.h" #include "worlddb.h"
#include "console.h" #include "console.h"
#include "client.h" #include "client.h"
#include "../common/md5.h" #include "../common/md5.h"
#include "WorldConfig.h" #include "world_config.h"
#include "../common/guilds.h" #include "../common/guilds.h"
#include "../common/packet_dump.h" #include "../common/packet_dump.h"
#include "../common/misc.h" #include "../common/misc.h"
@ -33,7 +33,7 @@
#include "cliententry.h" #include "cliententry.h"
#include "wguild_mgr.h" #include "wguild_mgr.h"
#include "lfplist.h" #include "lfplist.h"
#include "AdventureManager.h" #include "adventure_manager.h"
#include "ucs.h" #include "ucs.h"
#include "queryserv.h" #include "queryserv.h"

View File

@ -18,7 +18,7 @@
#ifndef ZONESERVER_H #ifndef ZONESERVER_H
#define ZONESERVER_H #define ZONESERVER_H
#include "WorldTCPConnection.h" #include "world_tcp_connection.h"
#include "../common/emu_tcp_connection.h" #include "../common/emu_tcp_connection.h"
#include <string.h> #include <string.h>
#include <string> #include <string>