pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-24 07:32:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

normalize includes: world

Browse Source
This commit is contained in:
brainiac 2025-12-18 00:45:20 -08:00 committed by Alex
parent 6314b386ef
commit 552a908f92
84 changed files with 712 additions and 795 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
world/CMakeLists.txt
View File

@ -96,6 +96,7 @@ add_executable(world ${world_sources} ${world_headers})
target_compile_definitions(world PRIVATE WORLD) target_compile_definitions(world PRIVATE WORLD)
target_link_libraries(world common) target_link_libraries(world common)
target_include_directories(world PRIVATE ..)
if(WIN32 AND EQEMU_BUILD_PCH) if(WIN32 AND EQEMU_BUILD_PCH)
target_precompile_headers(world PRIVATE ../common/pch/std-pch.h) target_precompile_headers(world PRIVATE ../common/pch/std-pch.h)

31
world/adventure.cpp
View File

@ -1,19 +1,20 @@
#include <glm/vec4.hpp>
#include "../common/global_define.h"
#include "../common/servertalk.h"
#include "../common/extprofile.h"
#include "../common/rulesys.h"
#include "../common/misc_functions.h"
#include "../common/strings.h"
#include "../common/random.h"
#include "adventure.h" #include "adventure.h"
#include "adventure_manager.h"
#include "worlddb.h" #include "common/extprofile.h"
#include "zonelist.h" #include "common/misc_functions.h"
#include "clientlist.h" #include "common/random.h"
#include "cliententry.h" #include "common/repositories/character_corpses_repository.h"
#include "../common/zone_store.h" #include "common/rulesys.h"
#include "../common/repositories/character_corpses_repository.h" #include "common/servertalk.h"
#include "common/strings.h"
#include "common/zone_store.h"
#include "world/adventure_manager.h"
#include "world/cliententry.h"
#include "world/clientlist.h"
#include "world/worlddb.h"
#include "world/zonelist.h"
#include "glm/vec4.hpp"
extern EQ::Random emu_random; extern EQ::Random emu_random;

15
world/adventure.h
View File

@ -1,13 +1,12 @@
#ifndef ADVENTURE_H #pragma once
#define ADVENTURE_H
#include "../common/global_define.h" #include "common/timer.h"
#include "../common/types.h" #include "common/types.h"
#include "../common/timer.h" #include "world/adventure_template.h"
#include "adventure_template.h"
#include <cstdlib>
#include <list> #include <list>
#include <string> #include <string>
#include <stdlib.h>
enum AdventureStatus enum AdventureStatus
{ {
@ -97,5 +96,3 @@ protected:
Timer *current_timer; Timer *current_timer;
int instance_id; int instance_id;
}; };
#endif

27
world/adventure_manager.cpp
View File

@ -1,18 +1,19 @@
#include "../common/global_define.h"
#include "../common/misc_functions.h"
#include "../common/strings.h"
#include "../common/servertalk.h"
#include "../common/rulesys.h"
#include "../common/random.h"
#include "adventure.h"
#include "adventure_manager.h" #include "adventure_manager.h"
#include "worlddb.h"
#include "zonelist.h" #include "common/misc_functions.h"
#include "clientlist.h" #include "common/random.h"
#include "cliententry.h" #include "common/rulesys.h"
#include "../common/zone_store.h" #include "common/servertalk.h"
#include "common/strings.h"
#include "common/zone_store.h"
#include "world/adventure.h"
#include "world/cliententry.h"
#include "world/clientlist.h"
#include "world/worlddb.h"
#include "world/zonelist.h"
#include <cstdio>
#include <sstream> #include <sstream>
#include <stdio.h>
AdventureManager::AdventureManager() AdventureManager::AdventureManager()
{ {

15
world/adventure_manager.h
View File

@ -1,11 +1,10 @@
#ifndef ADVENTURE_MANAGER_H #pragma once
#define ADVENTURE_MANAGER_H
#include "common/timer.h"
#include "common/types.h"
#include "world/adventure_template.h"
#include "world/adventure.h"
#include "../common/global_define.h"
#include "../common/types.h"
#include "../common/timer.h"
#include "adventure.h"
#include "adventure_template.h"
#include <map> #include <map>
#include <list> #include <list>
@ -94,5 +93,3 @@ protected:
Timer *save_timer; Timer *save_timer;
Timer *leaderboard_info_timer; Timer *leaderboard_info_timer;
}; };
#endif

11
world/adventure_template.h
View File

@ -1,9 +1,8 @@
#ifndef ADVENTURE_TEMPLATE_H #pragma once
#define ADVENTURE_TEMPLATE_H
#include "../common/global_define.h" #include "common/types.h"
#include "../common/types.h"
#pragma pack(push)
#pragma pack(1) #pragma pack(1)
struct AdventureTemplate struct AdventureTemplate
@ -42,6 +41,4 @@ struct AdventureTemplate
float graveyard_radius; float graveyard_radius;
}; };
#pragma pack() #pragma pack(pop)
#endif

7
world/cli/cli_bots_disable.cpp
View File

@ -1,6 +1,7 @@
#include "../world_server_cli.h" #include "world/world_server_cli.h"
#include "../worlddb.h"
#include "../../common/database_schema.h" #include "common/database_schema.h"
#include "world/worlddb.h"
void WorldserverCLI::BotsDisable(int argc, char **argv, argh::parser &cmd, std::string &description) void WorldserverCLI::BotsDisable(int argc, char **argv, argh::parser &cmd, std::string &description)
{ {

7
world/cli/cli_bots_enable.cpp
View File

@ -1,6 +1,7 @@
#include "../world_server_cli.h" #include "world/world_server_cli.h"
#include "../worlddb.h"
#include "../../common/rulesys.h" #include "common/rulesys.h"
#include "world/worlddb.h"
void WorldserverCLI::BotsEnable(int argc, char **argv, argh::parser &cmd, std::string &description) void WorldserverCLI::BotsEnable(int argc, char **argv, argh::parser &cmd, std::string &description)
{ {

9
world/cli/cli_copy_character.cpp
View File

@ -1,7 +1,8 @@
#include "../world_server_cli.h" #include "world/world_server_cli.h"
#include "../../common/eqemu_logsys.h"
#include "../../common/eqemu_logsys_log_aliases.h" #include "common/eqemu_logsys_log_aliases.h"
#include "../worlddb.h" #include "common/eqemu_logsys.h"
#include "world/worlddb.h"
void WorldserverCLI::CopyCharacter(int argc, char **argv, argh::parser &cmd, std::string &description) void WorldserverCLI::CopyCharacter(int argc, char **argv, argh::parser &cmd, std::string &description)
{ {

10
world/cli/cli_database_concurrency.cpp
View File

@ -1,8 +1,10 @@
#include "world/world_server_cli.h"
#include "common/eqemu_config.h"
#include "common/repositories/zone_repository.h"
#include <csignal>
#include <thread> #include <thread>
#include "../world_server_cli.h"
#include "../../common/repositories/zone_repository.h"
#include "../../common/eqemu_config.h"
#include <signal.h>
Database db; Database db;
Database db2; Database db2;

5
world/cli/cli_database_dump.cpp
View File

@ -1,5 +1,6 @@
#include "../world_server_cli.h" #include "world/world_server_cli.h"
#include "../../common/database/database_dump_service.h"
#include "common/database/database_dump_service.h"
void WorldserverCLI::DatabaseDump(int argc, char **argv, argh::parser &cmd, std::string &description) void WorldserverCLI::DatabaseDump(int argc, char **argv, argh::parser &cmd, std::string &description)
{ {

14
world/cli/cli_database_get_schema.cpp
View File

@ -1,6 +1,9 @@
#include "../world_server_cli.h" #include "world/world_server_cli.h"
#include "../../common/database_schema.h"
#include "../../common/json/json.h" #include "common/database_schema.h"
#include "common/json/json.h"
#include <iostream>
void WorldserverCLI::DatabaseGetSchema(int argc, char **argv, argh::parser &cmd, std::string &description) void WorldserverCLI::DatabaseGetSchema(int argc, char **argv, argh::parser &cmd, std::string &description)
{ {
@ -62,8 +65,5 @@ void WorldserverCLI::DatabaseGetSchema(int argc, char **argv, argh::parser &cmd,
schema["version_tables"] = version_tables_json; schema["version_tables"] = version_tables_json;
schema["bot_tables"] = bot_tables_json; schema["bot_tables"] = bot_tables_json;
std::stringstream payload; std::cout << schema << std::endl;
payload << schema;
std::cout << payload.str() << std::endl;
} }

4
world/cli/cli_database_set_account_status.cpp
View File

@ -1,5 +1,5 @@
#include "../world_server_cli.h" #include "world/world_server_cli.h"
#include "../worlddb.h" #include "world/worlddb.h"
void WorldserverCLI::DatabaseSetAccountStatus(int argc, char **argv, argh::parser &cmd, std::string &description) void WorldserverCLI::DatabaseSetAccountStatus(int argc, char **argv, argh::parser &cmd, std::string &description)
{ {

7
world/cli/cli_database_updates.cpp
View File

@ -1,6 +1,7 @@
#include "../world_server_cli.h" #include "world/world_server_cli.h"
#include "../worlddb.h"
#include "../../common/database/database_update.h" #include "common/database/database_update.h"
#include "world/worlddb.h"
void WorldserverCLI::DatabaseUpdates(int argc, char **argv, argh::parser &cmd, std::string &description) void WorldserverCLI::DatabaseUpdates(int argc, char **argv, argh::parser &cmd, std::string &description)
{ {

11
world/cli/cli_database_version.cpp
View File

@ -1,7 +1,10 @@
#include "../world_server_cli.h" #include "world/world_server_cli.h"
#include "../../common/version.h"
#include "../../common/json/json.h" #include "common/json/json.h"
#include "../../common/rulesys.h" #include "common/rulesys.h"
#include "common/version.h"
#include <iostream>
void WorldserverCLI::DatabaseVersion(int argc, char **argv, argh::parser &cmd, std::string &description) void WorldserverCLI::DatabaseVersion(int argc, char **argv, argh::parser &cmd, std::string &description)
{ {

9
world/cli/cli_etl_get_settings.cpp
View File

@ -1,7 +1,8 @@
#include "../world_server_cli.h" #include "world/world_server_cli.h"
#include "../worlddb.h"
#include "../../common/events/player_event_logs.h" #include "common/events/player_event_logs.h"
#include "../../common/json/json.h" #include "common/json/json.h"
#include "world/worlddb.h"
void WorldserverCLI::EtlGetSettings(int argc, char **argv, argh::parser &cmd, std::string &description) void WorldserverCLI::EtlGetSettings(int argc, char **argv, argh::parser &cmd, std::string &description)
{ {

7
world/cli/cli_mercs_disable.cpp
View File

@ -1,6 +1,7 @@
#include "../world_server_cli.h" #include "world/world_server_cli.h"
#include "../worlddb.h"
#include "../../common/database_schema.h" #include "common/database_schema.h"
#include "world/worlddb.h"
void WorldserverCLI::MercsDisable(int argc, char **argv, argh::parser &cmd, std::string &description) void WorldserverCLI::MercsDisable(int argc, char **argv, argh::parser &cmd, std::string &description)
{ {

7
world/cli/cli_mercs_enable.cpp
View File

@ -1,6 +1,7 @@
#include "../world_server_cli.h" #include "world/world_server_cli.h"
#include "../worlddb.h"
#include "../../common/database_schema.h" #include "common/database_schema.h"
#include "world/worlddb.h"
void WorldserverCLI::MercsEnable(int argc, char **argv, argh::parser &cmd, std::string &description) void WorldserverCLI::MercsEnable(int argc, char **argv, argh::parser &cmd, std::string &description)
{ {

12
world/cli/cli_test.cpp
View File

@ -1,9 +1,11 @@
#include "../world_server_cli.h" #include "world/world_server_cli.h"
#include <cereal/archives/json.hpp>
#include <cereal/types/vector.hpp> #include "common/events/player_events.h"
#include "common/memory/ksm.hpp"
#include "cereal/archives/json.hpp"
#include "cereal/types/vector.hpp"
#include <iomanip> #include <iomanip>
#include "../../common/events/player_events.h"
#include "../../common/memory/ksm.hpp"
void WorldserverCLI::TestCommand(int argc, char **argv, argh::parser &cmd, std::string &description) void WorldserverCLI::TestCommand(int argc, char **argv, argh::parser &cmd, std::string &description)
{ {

7
world/cli/cli_test_colors.cpp
View File

@ -1,6 +1,7 @@
#include "../world_server_cli.h" #include "world/world_server_cli.h"
#include "../../common/zone_store.h"
#include "../../common/termcolor/rang.hpp" #include "common/termcolor/rang.hpp"
#include "common/zone_store.h"
void WorldserverCLI::TestColors(int argc, char **argv, argh::parser &cmd, std::string &description) void WorldserverCLI::TestColors(int argc, char **argv, argh::parser &cmd, std::string &description)
{ {

13
world/cli/cli_test_expansion.cpp
View File

@ -1,9 +1,10 @@
#include "../world_server_cli.h" #include "world/world_server_cli.h"
#include "../../common/rulesys.h"
#include "../../common/repositories/content_flags_repository.h" #include "common/content/world_content_service.h"
#include "../../common/content/world_content_service.h" #include "common/repositories/content_flags_repository.h"
#include "../../common/repositories/criteria/content_filter_criteria.h" #include "common/repositories/criteria/content_filter_criteria.h"
#include "../worlddb.h" #include "common/rulesys.h"
#include "world/worlddb.h"
void WorldserverCLI::ExpansionTestCommand(int argc, char **argv, argh::parser &cmd, std::string &description) void WorldserverCLI::ExpansionTestCommand(int argc, char **argv, argh::parser &cmd, std::string &description)
{ {

7
world/cli/cli_test_repository.cpp
View File

@ -1,6 +1,7 @@
#include "../world_server_cli.h" #include "world/world_server_cli.h"
#include "../../common/repositories/instance_list_repository.h"
#include "../worlddb.h" #include "common/repositories/instance_list_repository.h"
#include "world/worlddb.h"
void WorldserverCLI::TestRepository(int argc, char **argv, argh::parser &cmd, std::string &description) void WorldserverCLI::TestRepository(int argc, char **argv, argh::parser &cmd, std::string &description)
{ {

7
world/cli/cli_test_repository_2.cpp
View File

@ -1,6 +1,7 @@
#include "../world_server_cli.h" #include "world/world_server_cli.h"
#include "../worlddb.h"
#include "../../common/repositories/zone_repository.h" #include "common/repositories/zone_repository.h"
#include "world/worlddb.h"
void WorldserverCLI::TestRepository2(int argc, char **argv, argh::parser &cmd, std::string &description) void WorldserverCLI::TestRepository2(int argc, char **argv, argh::parser &cmd, std::string &description)
{ {

12
world/cli/cli_test_string_benchmark.cpp
View File

@ -1,8 +1,10 @@
#include "../world_server_cli.h" #include "world/world_server_cli.h"
#include <cereal/archives/json.hpp>
#include <cereal/types/vector.hpp> #include "common/events/player_events.h"
#include "../../common/events/player_events.h" #include "common/timer.h"
#include "../../common/timer.h"
#include "cereal/archives/json.hpp"
#include "cereal/types/vector.hpp"
void WorldserverCLI::TestStringBenchmarkCommand(int argc, char **argv, argh::parser &cmd, std::string &description) void WorldserverCLI::TestStringBenchmarkCommand(int argc, char **argv, argh::parser &cmd, std::string &description)
{ {

9
world/cli/cli_version.cpp
View File

@ -1,6 +1,9 @@
#include "../world_server_cli.h" #include "world/world_server_cli.h"
#include "../../common/json/json.h"
#include "../../common/version.h" #include "common/json/json.h"
#include "common/version.h"
#include <iostream>
void WorldserverCLI::Version(int argc, char **argv, argh::parser &cmd, std::string &description) void WorldserverCLI::Version(int argc, char **argv, argh::parser &cmd, std::string &description)
{ {

95
world/client.cpp
View File

@ -16,59 +16,54 @@
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/global_define.h"
#include "../common/eq_packet.h"
#include "../common/eq_stream_intf.h"
#include "../common/misc.h"
#include "../common/rulesys.h"
#include "../common/emu_opcodes.h"
#include "../common/eq_packet_structs.h"
#include "../common/packet_dump.h"
#include "../common/eq_stream_intf.h"
#include "../common/inventory_profile.h"
#include "../common/races.h"
#include "../common/classes.h"
#include "../common/skills.h"
#include "../common/extprofile.h"
#include "../common/strings.h"
#include "../common/emu_versions.h"
#include "../common/random.h"
#include "../common/shareddb.h"
#include "../common/opcodemgr.h"
#include "../common/data_verification.h"
#include "../common/data_bucket.h"
#include "client.h" #include "client.h"
#include "worlddb.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 "sof_char_create_data.h"
#include "../common/zone_store.h"
#include "../common/repositories/account_repository.h"
#include "../common/repositories/player_event_logs_repository.h"
#include "../common/repositories/inventory_repository.h"
#include "../common/events/player_event_logs.h"
#include "../common/content/world_content_service.h"
#include "../common/repositories/group_id_repository.h"
#include "../common/repositories/character_data_repository.h"
#include "../common/skill_caps.h"
#include <iostream> #include "common/classes.h"
#include "common/content/world_content_service.h"
#include "common/data_bucket.h"
#include "common/data_verification.h"
#include "common/emu_opcodes.h"
#include "common/emu_versions.h"
#include "common/eq_packet_structs.h"
#include "common/eq_packet.h"
#include "common/eq_stream_intf.h"
#include "common/eq_stream_intf.h"
#include "common/events/player_event_logs.h"
#include "common/extprofile.h"
#include "common/inventory_profile.h"
#include "common/misc.h"
#include "common/opcodemgr.h"
#include "common/packet_dump.h"
#include "common/races.h"
#include "common/random.h"
#include "common/repositories/account_repository.h"
#include "common/repositories/character_data_repository.h"
#include "common/repositories/group_id_repository.h"
#include "common/repositories/inventory_repository.h"
#include "common/repositories/player_event_logs_repository.h"
#include "common/rulesys.h"
#include "common/shareddb.h"
#include "common/skill_caps.h"
#include "common/skills.h"
#include "common/strings.h"
#include "common/zone_store.h"
#include "world/clientlist.h"
#include "world/login_server_list.h"
#include "world/login_server.h"
#include "world/sof_char_create_data.h"
#include "world/wguild_mgr.h"
#include "world/world_config.h"
#include "world/worlddb.h"
#include "world/zonelist.h"
#include "world/zoneserver.h"
#include "zlib.h"
#include <climits>
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <iomanip> #include <iomanip>
#include <iostream>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <zlib.h>
#include <limits.h>
//FatherNitwit: uncomment to enable my IP based authentication hack
//#define IPBASED_AUTH_HACK
// Disgrace: for windows compile // Disgrace: for windows compile
#ifdef _WINDOWS #ifdef _WINDOWS

20
world/client.h
View File

@ -15,19 +15,17 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
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 CLIENT_H
#define CLIENT_H #pragma once
#include "common/eq_packet_structs.h"
#include "common/inventory_profile.h"
#include "common/linked_list.h"
#include "common/timer.h"
#include "world/cliententry.h"
#include <string> #include <string>
#include "../common/linked_list.h"
#include "../common/timer.h"
#include "../common/inventory_profile.h"
//#include "zoneserver.h"
#include "../common/eq_packet_structs.h"
#include "cliententry.h"
class EQApplicationPacket; class EQApplicationPacket;
class EQStreamInterface; class EQStreamInterface;
@ -128,5 +126,3 @@ private:
bool CheckCharCreateInfoSoF(CharCreate_Struct *cc); bool CheckCharCreateInfoSoF(CharCreate_Struct *cc);
bool CheckCharCreateInfoTitanium(CharCreate_Struct *cc); bool CheckCharCreateInfoTitanium(CharCreate_Struct *cc);
#endif

16
world/cliententry.cpp
View File

@ -1,12 +1,12 @@
#include "../common/global_define.h"
#include "cliententry.h" #include "cliententry.h"
#include "clientlist.h"
#include "login_server.h" #include "world/clientlist.h"
#include "login_server_list.h" #include "world/login_server_list.h"
#include "shared_task_manager.h" #include "world/login_server.h"
#include "worlddb.h" #include "world/shared_task_manager.h"
#include "zoneserver.h" #include "world/world_config.h"
#include "world_config.h" #include "world/worlddb.h"
#include "world/zoneserver.h"
extern uint32 numplayers; extern uint32 numplayers;
extern volatile bool RunLoops; extern volatile bool RunLoops;

16
world/cliententry.h
View File

@ -1,11 +1,10 @@
#ifndef CLIENTENTRY_H_ #pragma once
#define CLIENTENTRY_H_
#include "common/md5.h"
#include "common/rulesys.h"
#include "common/servertalk.h"
#include "common/types.h"
#include "../common/types.h"
#include "../common/md5.h"
//#include "../common/eq_packet_structs.h"
#include "../common/servertalk.h"
#include "../common/rulesys.h"
#include <vector> #include <vector>
typedef enum { typedef enum {
@ -160,6 +159,3 @@ private:
std::unique_ptr<ServerPacket> m_dz_invite; std::unique_ptr<ServerPacket> m_dz_invite;
}; };
#endif /*CLIENTENTRY_H_*/

36
world/clientlist.cpp
View File

@ -16,24 +16,24 @@
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/global_define.h" #include "common/classes.h"
#include "clientlist.h" #include "common/event_sub.h"
#include "zoneserver.h" #include "common/guilds.h"
#include "zonelist.h" #include "common/json/json.h"
#include "client.h" #include "common/misc_functions.h"
#include "worlddb.h" #include "common/misc.h"
#include "../common/strings.h" #include "common/packet_dump.h"
#include "../common/guilds.h" #include "common/races.h"
#include "../common/races.h" #include "common/strings.h"
#include "../common/classes.h" #include "common/zone_store.h"
#include "../common/packet_dump.h" #include "world/client.h"
#include "../common/misc.h" #include "world/clientlist.h"
#include "../common/misc_functions.h" #include "world/web_interface.h"
#include "../common/json/json.h" #include "world/wguild_mgr.h"
#include "../common/event_sub.h" #include "world/worlddb.h"
#include "web_interface.h" #include "world/zonelist.h"
#include "wguild_mgr.h" #include "world/zoneserver.h"
#include "../common/zone_store.h"
#include <set> #include <set>
uint32 numplayers = 0; //this really wants to be a member variable of ClientList... uint32 numplayers = 0; //this really wants to be a member variable of ClientList...

25
world/clientlist.h
View File

@ -1,16 +1,16 @@
#ifndef CLIENTLIST_H_ #pragma once
#define CLIENTLIST_H_
#include "common/eq_packet_structs.h"
#include "common/event/timer.h"
#include "common/json/json.h"
#include "common/linked_list.h"
#include "common/net/console_server_connection.h"
#include "common/rulesys.h"
#include "common/servertalk.h"
#include "common/timer.h"
#include "../common/eq_packet_structs.h"
#include "../common/linked_list.h"
#include "../common/json/json.h"
#include "../common/timer.h"
#include "../common/rulesys.h"
#include "../common/servertalk.h"
#include "../common/event/timer.h"
#include "../common/net/console_server_connection.h"
#include <vector>
#include <string> #include <string>
#include <vector>
class Client; class Client;
class ZoneServer; class ZoneServer;
@ -111,6 +111,3 @@ private:
std::unordered_set<uint32_t> m_gm_zone_server_ids; std::unordered_set<uint32_t> m_gm_zone_server_ids;
std::unordered_map<uint32_t, std::unordered_set<uint32_t>> m_guild_zone_server_ids; std::unordered_map<uint32_t, std::unordered_set<uint32_t>> m_guild_zone_server_ids;
}; };
#endif /*CLIENTLIST_H_*/

28
world/console.cpp
View File

@ -19,19 +19,21 @@
*/ */
#include "console.h" #include "console.h"
#include "clientlist.h"
#include "login_server.h" #include "common/md5.h"
#include "login_server_list.h" #include "common/strings.h"
#include "world_config.h" #include "common/zone_store.h"
#include "world_console_connection.h" #include "world/clientlist.h"
#include "worlddb.h" #include "world/eqemu_api_world_data_service.h"
#include "zonelist.h" #include "world/login_server_list.h"
#include "zoneserver.h" #include "world/login_server.h"
#include "../common/strings.h" #include "world/world_config.h"
#include "../common/md5.h" #include "world/world_console_connection.h"
#include "eqemu_api_world_data_service.h" #include "world/worlddb.h"
#include "../common/zone_store.h" #include "world/zonelist.h"
#include <fmt/format.h> #include "world/zoneserver.h"
#include "fmt/format.h"
/** /**
* @param username * @param username

2
world/console.h
View File

@ -1,5 +1,5 @@
#pragma once #pragma once
#include "../common/net/console_server.h" #include "common/net/console_server.h"
void RegisterConsoleFunctions(std::unique_ptr<EQ::Net::ConsoleServer> &console); void RegisterConsoleFunctions(std::unique_ptr<EQ::Net::ConsoleServer> &console);

17
world/dynamic_zone.cpp
View File

@ -1,12 +1,13 @@
#include "dynamic_zone.h" #include "dynamic_zone.h"
#include "cliententry.h"
#include "clientlist.h" #include "common/eqemu_logsys.h"
#include "dynamic_zone_manager.h" #include "common/repositories/instance_list_repository.h"
#include "worlddb.h" #include "world/cliententry.h"
#include "zonelist.h" #include "world/clientlist.h"
#include "zoneserver.h" #include "world/dynamic_zone_manager.h"
#include "../common/eqemu_logsys.h" #include "world/worlddb.h"
#include "../common/repositories/instance_list_repository.h" #include "world/zonelist.h"
#include "world/zoneserver.h"
Database& DynamicZone::GetDatabase() Database& DynamicZone::GetDatabase()
{ {

11
world/dynamic_zone.h
View File

@ -1,9 +1,8 @@
#ifndef WORLD_DYNAMIC_ZONE_H #pragma once
#define WORLD_DYNAMIC_ZONE_H
#include "../common/dynamic_zone_base.h" #include "common/dynamic_zone_base.h"
#include "../common/rulesys.h" #include "common/rulesys.h"
#include "../common/timer.h" #include "common/timer.h"
class Database; class Database;
class ServerPacket; class ServerPacket;
@ -52,5 +51,3 @@ private:
Timer m_choose_leader_cooldown_timer{ static_cast<uint32_t>(RuleI(Expedition, ChooseLeaderCooldownTime)) }; Timer m_choose_leader_cooldown_timer{ static_cast<uint32_t>(RuleI(Expedition, ChooseLeaderCooldownTime)) };
Timer m_warning_cooldown_timer{ 1 }; // non-zero so it's enabled initially Timer m_warning_cooldown_timer{ 1 }; // non-zero so it's enabled initially
}; };
#endif

20
world/dynamic_zone_manager.cpp
View File

@ -1,13 +1,15 @@
#include "dynamic_zone_manager.h" #include "dynamic_zone_manager.h"
#include "dynamic_zone.h"
#include "cliententry.h" #include "common/repositories/dynamic_zone_lockouts_repository.h"
#include "clientlist.h" #include "common/rulesys.h"
#include "worlddb.h" #include "world/cliententry.h"
#include "zonelist.h" #include "world/clientlist.h"
#include "zoneserver.h" #include "world/dynamic_zone.h"
#include "../common/rulesys.h" #include "world/worlddb.h"
#include "../common/repositories/dynamic_zone_lockouts_repository.h" #include "world/zonelist.h"
#include <cereal/types/utility.hpp> #include "world/zoneserver.h"
#include "cereal/types/utility.hpp"
DynamicZoneManager dynamic_zone_manager; DynamicZoneManager dynamic_zone_manager;

10
world/dynamic_zone_manager.h
View File

@ -1,8 +1,8 @@
#ifndef WORLD_DYNAMIC_ZONE_MANAGER_H #pragma once
#define WORLD_DYNAMIC_ZONE_MANAGER_H
#include "common/repositories/dynamic_zone_templates_repository.h"
#include "common/timer.h"
#include "../common/timer.h"
#include "../common/repositories/dynamic_zone_templates_repository.h"
#include <memory> #include <memory>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
@ -35,5 +35,3 @@ private:
Timer m_process_throttle_timer{}; Timer m_process_throttle_timer{};
std::unordered_map<uint32_t, DynamicZoneTemplatesRepository::DynamicZoneTemplates> m_dz_templates; std::unordered_map<uint32_t, DynamicZoneTemplatesRepository::DynamicZoneTemplates> m_dz_templates;
}; };
#endif

28
world/eqemu_api_world_data_service.cpp
View File

@ -1,17 +1,19 @@
#include <fmt/format.h>
#include "clientlist.h"
#include "cliententry.h"
#include "eqemu_api_world_data_service.h" #include "eqemu_api_world_data_service.h"
#include "zoneserver.h"
#include "zonelist.h" #include "common/database_schema.h"
#include "../common/database_schema.h" #include "common/server_reload_types.h"
#include "../common/server_reload_types.h" #include "common/zone_store.h"
#include "../common/zone_store.h" #include "world/cliententry.h"
#include "worlddb.h" #include "world/clientlist.h"
#include "wguild_mgr.h" #include "world/queryserv.h"
#include "world_config.h" #include "world/ucs.h"
#include "ucs.h" #include "world/wguild_mgr.h"
#include "queryserv.h" #include "world/world_config.h"
#include "world/worlddb.h"
#include "world/zonelist.h"
#include "world/zoneserver.h"
#include "fmt/format.h"
extern WorldGuildManager guild_mgr; extern WorldGuildManager guild_mgr;

8
world/eqemu_api_world_data_service.h
View File

@ -18,10 +18,9 @@
* *
*/ */
#ifndef EQEMU_API_WORLD_DATA_SERVICE_H #pragma once
#define EQEMU_API_WORLD_DATA_SERVICE_H
#include "../common/json/json.h" #include "common/json/json.h"
class EQEmuApiWorldDataService { class EQEmuApiWorldDataService {
public: public:
@ -30,6 +29,3 @@ public:
static void message(Json::Value &r, const std::string &message); static void message(Json::Value &r, const std::string &message);
static void callGetGuildDetails(Json::Value &response, const std::vector<std::string> &args); static void callGetGuildDetails(Json::Value &response, const std::vector<std::string> &args);
}; };
#endif //EQEMU_API_WORLD_DATA_SERVICE_H

14
world/eql_config.cpp
View File

@ -15,13 +15,15 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
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/global_define.h"
#include "eql_config.h" #include "eql_config.h"
#include "worlddb.h"
#include "launcher_link.h" #include "common/strings.h"
#include "launcher_list.h" #include "common/zone_store.h"
#include "../common/strings.h" #include "world/launcher_link.h"
#include "../common/zone_store.h" #include "world/launcher_list.h"
#include "world/worlddb.h"
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>

12
world/eql_config.h
View File

@ -15,11 +15,12 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
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 EQLCONFIG_H_
#define EQLCONFIG_H_
#include "../common/types.h" #pragma once
#include "worlddb.h"
#include "common/types.h"
#include "world/worlddb.h"
#include <map> #include <map>
#include <string> #include <string>
@ -53,6 +54,3 @@ protected:
std::map<std::string, LauncherZone> m_zones; //static zones. std::map<std::string, LauncherZone> m_zones; //static zones.
}; };
#endif /*EQLCONFIG_H_*/

21
world/launcher_link.cpp
View File

@ -16,21 +16,20 @@ along with this program; if not, write to the Free Software
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/global_define.h"
#include "launcher_link.h" #include "launcher_link.h"
#include "launcher_list.h"
#include "world_config.h"
#include "../common/md5.h" #include "common/md5.h"
#include "../common/packet_dump.h" #include "common/misc_functions.h"
#include "../common/servertalk.h" #include "common/packet_dump.h"
#include "../common/strings.h" #include "common/servertalk.h"
#include "../common/misc_functions.h" #include "common/strings.h"
#include "worlddb.h" #include "world/eql_config.h"
#include "eql_config.h" #include "world/launcher_list.h"
#include "world/world_config.h"
#include "world/worlddb.h"
#include <vector>
#include <string> #include <string>
#include <vector>
extern LauncherList launcher_list; extern LauncherList launcher_list;

16
world/launcher_link.h
View File

@ -15,16 +15,17 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
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 LAUNCHERLINK_H_
#define LAUNCHERLINK_H_
#include "../common/timer.h" #pragma once
#include "../common/net/servertalk_server_connection.h"
#include "../common/event/timer.h" #include "common/event/timer.h"
#include "common/net/servertalk_server_connection.h"
#include "common/timer.h"
#include <map>
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include <map>
class ServerPacket; class ServerPacket;
@ -76,6 +77,3 @@ protected:
} ZoneState; } ZoneState;
std::map<std::string, ZoneState> m_states; std::map<std::string, ZoneState> m_states;
}; };
#endif /*LAUNCHERLINK_H_*/

6
world/launcher_list.cpp
View File

@ -16,12 +16,10 @@ along with this program; if not, write to the Free Software
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/global_define.h"
#include "launcher_list.h" #include "launcher_list.h"
#include "launcher_link.h"
#include "eql_config.h" #include "world/eql_config.h"
#include "world/launcher_link.h"
LauncherList::LauncherList() LauncherList::LauncherList()
: nextID(1) : nextID(1)

16
world/launcher_list.h
View File

@ -15,15 +15,16 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
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 LAUNCHERLIST_H_
#define LAUNCHERLIST_H_
#include "../common/types.h" #pragma once
#include "../common/net/servertalk_server_connection.h"
#include "common/types.h"
#include "common/net/servertalk_server_connection.h"
#include <map> #include <map>
#include <vector>
#include <string>
#include <memory> #include <memory>
#include <string>
#include <vector>
class LauncherLink; class LauncherLink;
class EQLConfig; class EQLConfig;
@ -50,6 +51,3 @@ protected:
std::vector<LauncherLink *> m_pendingLaunchers; //we own these objects, have not yet identified themself std::vector<LauncherLink *> m_pendingLaunchers; //we own these objects, have not yet identified themself
int nextID; int nextID;
}; };
#endif /*LAUNCHERLIST_H_*/

12
world/lfplist.cpp
View File

@ -17,13 +17,13 @@
*/ */
#include "lfplist.h" #include "lfplist.h"
#include "cliententry.h"
#include "clientlist.h"
#include "zoneserver.h"
#include "zonelist.h"
#include "../common/misc_functions.h" #include "common/classes.h"
#include "../common/classes.h" #include "common/misc_functions.h"
#include "world/cliententry.h"
#include "world/clientlist.h"
#include "world/zonelist.h"
#include "world/zoneserver.h"
GroupLFP::GroupLFP(uint32 inLeaderID) { GroupLFP::GroupLFP(uint32 inLeaderID) {

16
world/lfplist.h
View File

@ -16,13 +16,12 @@
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 LFPENTRY_H #pragma once
#define LFPENTRY_H
#include "../common/eq_packet_structs.h" #include "common/eq_packet_structs.h"
#include "../common/servertalk.h" #include "common/linked_list.h"
#include "../common/linked_list.h" #include "common/servertalk.h"
#include "../common/timer.h" #include "common/timer.h"
class GroupLFP { class GroupLFP {
@ -59,9 +58,4 @@ public:
private: private:
LinkedList<GroupLFP*> LFPGroupList; LinkedList<GroupLFP*> LFPGroupList;
Timer LFPStaleTimer; Timer LFPStaleTimer;
}; };
#endif

39
world/login_server.cpp
View File

@ -1,24 +1,23 @@
#include "../common/global_define.h"
#include <iostream>
#include <string.h>
#include <stdio.h>
#include <iomanip>
#include <stdlib.h>
#include "../common/version.h"
#include "../common/servertalk.h"
#include "../common/misc_functions.h"
#include "../common/eq_packet_structs.h"
#include "../common/packet_dump.h"
#include "../common/strings.h"
#include "../common/eqemu_logsys.h"
#include "login_server.h" #include "login_server.h"
#include "login_server_list.h"
#include "zoneserver.h" #include "common/eq_packet_structs.h"
#include "worlddb.h" #include "common/eqemu_logsys.h"
#include "zonelist.h" #include "common/misc_functions.h"
#include "clientlist.h" #include "common/packet_dump.h"
#include "cliententry.h" #include "common/servertalk.h"
#include "world_config.h" #include "common/strings.h"
#include "common/version.h"
#include "world/cliententry.h"
#include "world/clientlist.h"
#include "world/login_server_list.h"
#include "world/world_config.h"
#include "world/worlddb.h"
#include "world/zonelist.h"
#include "world/zoneserver.h"
#include <cstring>
#include <cstdio>
#include <cstdlib>
extern uint32 numzones; extern uint32 numzones;
extern uint32 numplayers; extern uint32 numplayers;

23
world/login_server.h
View File

@ -1,15 +1,15 @@
#ifndef LOGINSERVER_H #pragma once
#define LOGINSERVER_H
#include "common/eq_packet_structs.h"
#include "common/event/timer.h"
#include "common/linked_list.h"
#include "common/mutex.h"
#include "common/net/servertalk_client_connection.h"
#include "common/net/servertalk_legacy_client_connection.h"
#include "common/queue.h"
#include "common/servertalk.h"
#include "common/timer.h"
#include "../common/servertalk.h"
#include "../common/linked_list.h"
#include "../common/timer.h"
#include "../common/queue.h"
#include "../common/eq_packet_structs.h"
#include "../common/mutex.h"
#include "../common/net/servertalk_client_connection.h"
#include "../common/net/servertalk_legacy_client_connection.h"
#include "../common/event/timer.h"
#include <memory> #include <memory>
class LoginServer{ class LoginServer{
@ -63,4 +63,3 @@ private:
bool m_can_account_update; bool m_can_account_update;
bool m_is_legacy; bool m_is_legacy;
}; };
#endif

35
world/login_server_list.cpp
View File

@ -15,27 +15,26 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
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/global_define.h"
#include <iostream> #include "login_server_list.h"
#include <string.h>
#include <stdio.h> #include "common/eq_packet_structs.h"
#include <iomanip> #include "common/packet_dump.h"
#include <stdlib.h> #include "common/servertalk.h"
#include "../common/version.h" #include "common/version.h"
#include "world/clientlist.h"
#include "world/login_server.h"
#include "world/world_config.h"
#include "world/worlddb.h"
#include "world/zonelist.h"
#include "world/zoneserver.h"
#include <cstdio>
#include <cstdlib>
#include <cstring>
#define IGNORE_LS_FATAL_ERROR #define IGNORE_LS_FATAL_ERROR
#include "../common/servertalk.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 "world_config.h"
extern uint32 numzones; extern uint32 numzones;
extern uint32 numplayers; extern uint32 numplayers;
extern volatile bool RunLoops; extern volatile bool RunLoops;

19
world/login_server_list.h
View File

@ -1,11 +1,11 @@
#ifndef LOGINSERVERLIST_H_ #pragma once
#define LOGINSERVERLIST_H_
#include "common/eq_packet_structs.h"
#include "common/mutex.h"
#include "common/queue.h"
#include "common/servertalk.h"
#include "common/timer.h"
#include "../common/servertalk.h"
#include "../common/timer.h"
#include "../common/queue.h"
#include "../common/eq_packet_structs.h"
#include "../common/mutex.h"
#include <list> #include <list>
class LoginServer; class LoginServer;
@ -31,8 +31,3 @@ public:
protected: protected:
std::list<std::unique_ptr<LoginServer>> m_list; std::list<std::unique_ptr<LoginServer>> m_list;
}; };
#endif /*LOGINSERVERLIST_H_*/

112
world/main.cpp
View File

@ -18,79 +18,55 @@
* *
*/ */
#include "../common/global_define.h" #include "common/content/world_content_service.h"
#include "common/crash.h"
#include <iostream> #include "common/eq_packet.h"
#include <string.h> #include "common/eq_stream_ident.h"
#include <stdio.h> #include "common/eqemu_logsys.h"
#include <stdlib.h> #include "common/eqtime.h"
#include <signal.h> #include "common/event/event_loop.h"
#include "common/events/player_event_logs.h"
#include "../common/strings.h" #include "common/guilds.h"
#include "../common/eqemu_logsys.h" #include "common/ip_util.h"
#include "../common/queue.h" #include "common/misc.h"
#include "../common/timer.h" #include "common/net/eqstream.h"
#include "../common/eq_packet.h" #include "common/patches/patches.h"
#include "../common/seperator.h" #include "common/path_manager.h"
#include "../common/version.h" #include "common/platform.h"
#include "../common/eqtime.h" #include "common/repositories/character_expedition_lockouts_repository.h"
#include "../common/event/event_loop.h" #include "common/repositories/character_task_timers_repository.h"
#include "../common/net/eqstream.h" #include "common/rulesys.h"
#include "../common/opcodemgr.h" #include "common/skill_caps.h"
#include "../common/guilds.h" #include "common/timer.h"
#include "../common/eq_stream_ident.h" #include "common/version.h"
#include "../common/rulesys.h" #include "world/adventure_manager.h"
#include "../common/platform.h" #include "world/client.h"
#include "../common/crash.h" #include "world/clientlist.h"
#include "../common/misc.h" #include "world/console.h"
#include "client.h" #include "world/dynamic_zone_manager.h"
#include "worlddb.h" #include "world/launcher_list.h"
#include "wguild_mgr.h" #include "world/lfplist.h"
#include "../common/evolving_items.h" #include "world/login_server.h"
#include "world/queryserv.h"
#include "world/shared_task_manager.h"
#include "world/ucs.h"
#include "world/web_interface.h"
#include "world/wguild_mgr.h"
#include "world/world_boot.h"
#include "world/world_config.h"
#include "world/world_event_scheduler.h"
#include "world/world_server_cli.h"
#include "world/worlddb.h"
#include "world/zonelist.h"
#include "world/zoneserver.h"
#include "fmt/format.h"
#include <csignal>
#include <cstdlib>
#ifdef _WINDOWS #ifdef _WINDOWS
#include <process.h>
#define snprintf _snprintf
#define strncasecmp _strnicmp
#define strcasecmp _stricmp
#include <conio.h> #include <conio.h>
#else
#include <sys/sem.h>
#include <thread>
#endif #endif
#include "../common/patches/patches.h"
#include "zoneserver.h"
#include "login_server.h"
#include "login_server_list.h"
#include "world_config.h"
#include "zonelist.h"
#include "clientlist.h"
#include "launcher_list.h"
#include "lfplist.h"
#include "adventure_manager.h"
#include "ucs.h"
#include "queryserv.h"
#include "web_interface.h"
#include "console.h"
#include "dynamic_zone_manager.h"
#include "world_server_cli.h"
#include "../common/content/world_content_service.h"
#include "../common/repositories/character_expedition_lockouts_repository.h"
#include "../common/repositories/character_task_timers_repository.h"
#include "../common/zone_store.h"
#include "world_event_scheduler.h"
#include "shared_task_manager.h"
#include "world_boot.h"
#include "../common/path_manager.h"
#include "../common/events/player_event_logs.h"
#include "../common/skill_caps.h"
#include "../common/repositories/character_parcels_repository.h"
#include "../common/ip_util.h"
GroupLFPList LFPGroupList; GroupLFPList LFPGroupList;
LauncherList launcher_list; LauncherList launcher_list;
volatile bool RunLoops = true; volatile bool RunLoops = true;

14
world/queryserv.cpp
View File

@ -1,13 +1,11 @@
#include "../common/global_define.h"
#include "../common/eqemu_logsys.h"
#include "queryserv.h" #include "queryserv.h"
#include "world_config.h"
#include "clientlist.h"
#include "zonelist.h"
#include "common/eqemu_logsys.h"
#include "../common/md5.h" #include "common/md5.h"
#include "../common/packet_dump.h" #include "common/packet_dump.h"
#include "world/clientlist.h"
#include "world/world_config.h"
#include "world/zonelist.h"
QueryServConnection::QueryServConnection() QueryServConnection::QueryServConnection()
{ {

13
world/queryserv.h
View File

@ -1,10 +1,9 @@
#ifndef QueryServ_H #pragma once
#define QueryServ_H
#include "../common/types.h" #include "common/types.h"
#include "../common/net/servertalk_server.h" #include "common/net/servertalk_server.h"
#include "../common/servertalk.h" #include "common/servertalk.h"
#include "../common/event/timer.h" #include "common/event/timer.h"
class QueryServConnection class QueryServConnection
{ {
@ -26,5 +25,3 @@ private:
std::map<std::string, std::shared_ptr<EQ::Net::ServertalkServerConnection>> m_streams; std::map<std::string, std::shared_ptr<EQ::Net::ServertalkServerConnection>> m_streams;
std::unique_ptr<EQ::Timer> m_keepalive; std::unique_ptr<EQ::Timer> m_keepalive;
}; };
#endif /*QueryServ_H_*/

34
world/shared_task_manager.cpp
View File

@ -1,21 +1,21 @@
#include "shared_task_manager.h" #include "shared_task_manager.h"
#include "cliententry.h"
#include "clientlist.h" #include "common/repositories/character_data_repository.h"
#include "dynamic_zone.h" #include "common/repositories/character_task_timers_repository.h"
#include "dynamic_zone_manager.h" #include "common/repositories/completed_shared_task_activity_state_repository.h"
#include "zonelist.h" #include "common/repositories/completed_shared_task_members_repository.h"
#include "zoneserver.h" #include "common/repositories/completed_shared_tasks_repository.h"
#include "shared_task_world_messaging.h" #include "common/repositories/shared_task_activity_state_repository.h"
#include "../common/rulesys.h" #include "common/repositories/shared_task_dynamic_zones_repository.h"
#include "../common/repositories/character_data_repository.h" #include "common/repositories/shared_task_members_repository.h"
#include "../common/repositories/character_task_timers_repository.h" #include "common/rulesys.h"
#include "../common/repositories/shared_task_members_repository.h" #include "world/cliententry.h"
#include "../common/repositories/shared_task_activity_state_repository.h" #include "world/clientlist.h"
#include "../common/repositories/completed_shared_tasks_repository.h" #include "world/dynamic_zone_manager.h"
#include "../common/repositories/completed_shared_task_members_repository.h" #include "world/dynamic_zone.h"
#include "../common/repositories/completed_shared_task_activity_state_repository.h" #include "world/shared_task_world_messaging.h"
#include "../common/repositories/shared_task_dynamic_zones_repository.h" #include "world/zonelist.h"
#include <ctime> #include "world/zoneserver.h"
SharedTaskManager::SharedTaskManager() SharedTaskManager::SharedTaskManager()
: m_process_timer{ static_cast<uint32_t>(RuleI(TaskSystem, SharedTasksWorldProcessRate)) } : m_process_timer{ static_cast<uint32_t>(RuleI(TaskSystem, SharedTasksWorldProcessRate)) }

13
world/shared_task_manager.h
View File

@ -1,10 +1,9 @@
#ifndef EQEMU_SHARED_TASK_MANAGER_H #pragma once
#define EQEMU_SHARED_TASK_MANAGER_H
#include "../common/database.h" #include "common/database.h"
#include "../common/shared_tasks.h" #include "common/repositories/character_task_timers_repository.h"
#include "../common/timer.h" #include "common/shared_tasks.h"
#include "../common/repositories/character_task_timers_repository.h" #include "common/timer.h"
class DynamicZone; class DynamicZone;
@ -147,5 +146,3 @@ protected:
// memory search // memory search
std::vector<SharedTaskMember> FindCharactersInSharedTasks(const std::vector<uint32_t> &find_characters); std::vector<SharedTaskMember> FindCharactersInSharedTasks(const std::vector<uint32_t> &find_characters);
}; };
#endif //EQEMU_SHARED_TASK_MANAGER_H

29
world/shared_task_world_messaging.cpp
View File

@ -1,18 +1,19 @@
#include "shared_task_world_messaging.h" #include "shared_task_world_messaging.h"
#include "cliententry.h"
#include "worlddb.h" #include "common/eqemu_logsys.h"
#include "../common/shared_tasks.h" #include "common/repositories/shared_task_members_repository.h"
#include "../common/eqemu_logsys.h" #include "common/repositories/task_activities_repository.h"
#include "../common/repositories/tasks_repository.h" #include "common/repositories/tasks_repository.h"
#include "../common/tasks.h" #include "common/shared_tasks.h"
#include "cliententry.h" #include "common/tasks.h"
#include "clientlist.h" #include "world/cliententry.h"
#include "zonelist.h" #include "world/cliententry.h"
#include "zoneserver.h" #include "world/clientlist.h"
#include "shared_task_manager.h" #include "world/dynamic_zone.h"
#include "../common/repositories/shared_task_members_repository.h" #include "world/shared_task_manager.h"
#include "../common/repositories/task_activities_repository.h" #include "world/worlddb.h"
#include "dynamic_zone.h" #include "world/zonelist.h"
#include "world/zoneserver.h"
void SharedTaskWorldMessaging::HandleZoneMessage(ServerPacket *pack) void SharedTaskWorldMessaging::HandleZoneMessage(ServerPacket *pack)
{ {

22
world/shared_task_world_messaging.h
View File

@ -1,18 +1,14 @@
#ifndef EQEMU_SHARED_TASK_WORLD_MESSAGING_H #pragma once
#define EQEMU_SHARED_TASK_WORLD_MESSAGING_H
#include "../common/types.h" #include "common/eqemu_logsys.h"
#include "../common/servertalk.h" #include "common/repositories/tasks_repository.h"
#include "../common/shared_tasks.h" #include "common/servertalk.h"
#include "../common/eqemu_logsys.h" #include "common/shared_tasks.h"
#include "../common/repositories/tasks_repository.h" #include "common/tasks.h"
#include "../common/tasks.h" #include "common/types.h"
class SharedTaskWorldMessaging { class SharedTaskWorldMessaging
{
public: public:
static void HandleZoneMessage(ServerPacket *pack); static void HandleZoneMessage(ServerPacket *pack);
}; };
#endif //EQEMU_SHARED_TASK_WORLD_MESSAGING_H

7
world/sof_char_create_data.h
View File

@ -1,6 +1,6 @@
#ifndef SOFCHARCREATEDATA_H #pragma once
#define SOFCHARCREATEDATA_H
#pragma pack(push)
#pragma pack(1) #pragma pack(1)
struct RaceClassAllocation { struct RaceClassAllocation {
@ -26,6 +26,5 @@ struct RaceClassCombos {
SoFCCStartZoneData StartZoneData[641]; SoFCCStartZoneData StartZoneData[641];
}; };
*/ */
#pragma pack()
#endif #pragma pack(pop)

13
world/ucs.cpp
View File

@ -1,12 +1,11 @@
#include "../common/global_define.h"
#include "../common/eqemu_logsys.h"
#include "ucs.h" #include "ucs.h"
#include "world_config.h"
#include "../common/misc_functions.h" #include "common/eqemu_logsys.h"
#include "../common/md5.h" #include "common/event/timer.h"
#include "../common/packet_dump.h" #include "common/md5.h"
#include "../common/event/timer.h" #include "common/misc_functions.h"
#include "common/packet_dump.h"
#include "world/world_config.h"
UCSConnection::UCSConnection() UCSConnection::UCSConnection()
{ {

14
world/ucs.h
View File

@ -1,10 +1,10 @@
#ifndef UCS_H #pragma once
#define UCS_H
#include "common/event/timer.h"
#include "common/net/servertalk_server_connection.h"
#include "common/servertalk.h"
#include "common/types.h"
#include "../common/types.h"
#include "../common/net/servertalk_server_connection.h"
#include "../common/servertalk.h"
#include "../common/event/timer.h"
#include <memory> #include <memory>
class UCSConnection class UCSConnection
@ -30,5 +30,3 @@ private:
std::shared_ptr<EQ::Net::ServertalkServerConnection> connection; std::shared_ptr<EQ::Net::ServertalkServerConnection> connection;
}; };
#endif /*UCS_H_*/

4
world/web_interface.cpp
View File

@ -1,7 +1,7 @@
#include "web_interface.h" #include "web_interface.h"
#include "../common/json/json.h"
#include "web_interface_eqw.h" #include "common/json/json.h"
#include "world/web_interface_eqw.h"
#include <sstream> #include <sstream>

9
world/web_interface.h
View File

@ -1,12 +1,11 @@
#pragma once #pragma once
#include "../common/net/servertalk_server_connection.h" #include "common/json/json.h"
#include "../common/json/json.h" #include "common/net/servertalk_server_connection.h"
#include <functional>
#include <map> #include <map>
#include <string> #include <string>
#include <functional>
class WebInterface class WebInterface
{ {

13
world/web_interface_eqw.cpp
View File

@ -1,10 +1,11 @@
#include "web_interface_eqw.h" #include "web_interface_eqw.h"
#include "web_interface.h"
#include "world_config.h" #include "world/clientlist.h"
#include "login_server_list.h" #include "world/launcher_list.h"
#include "clientlist.h" #include "world/login_server_list.h"
#include "zonelist.h" #include "world/web_interface.h"
#include "launcher_list.h" #include "world/world_config.h"
#include "world/zonelist.h"
extern LauncherList launcher_list; extern LauncherList launcher_list;

32
world/wguild_mgr.cpp
View File

@ -16,23 +16,23 @@
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/eqemu_logsys.h"
#include "../common/global_define.h"
#include "wguild_mgr.h" #include "wguild_mgr.h"
#include "../common/servertalk.h"
#include "clientlist.h" #include "common/eqemu_logsys.h"
#include "zonelist.h" #include "common/repositories/guild_bank_repository.h"
#include "zoneserver.h" #include "common/repositories/guild_members_repository.h"
#include "cliententry.h" #include "common/repositories/guild_permissions_repository.h"
#include "client.h" #include "common/repositories/guild_ranks_repository.h"
#include "../common/repositories/guilds_repository.h" #include "common/repositories/guild_tributes_repository.h"
#include "../common/repositories/guild_ranks_repository.h" #include "common/repositories/guilds_repository.h"
#include "../common/repositories/guild_permissions_repository.h" #include "common/repositories/tribute_levels_repository.h"
#include "../common/repositories/guild_members_repository.h" #include "common/repositories/tributes_repository.h"
#include "../common/repositories/guild_bank_repository.h" #include "common/servertalk.h"
#include "../common/repositories/guild_tributes_repository.h" #include "world/client.h"
#include "../common/repositories/tributes_repository.h" #include "world/cliententry.h"
#include "../common/repositories/tribute_levels_repository.h" #include "world/clientlist.h"
#include "world/zonelist.h"
#include "world/zoneserver.h"
std::map<uint32, TributeData> tribute_list; std::map<uint32, TributeData> tribute_list;

11
world/wguild_mgr.h
View File

@ -1,8 +1,7 @@
#ifndef WGUILD_MGR_H_ #pragma once
#define WGUILD_MGR_H_
#include "../common/types.h" #include "common/types.h"
#include "../common/guild_base.h" #include "common/guild_base.h"
class Client; class Client;
class ServerPacket; class ServerPacket;
@ -30,7 +29,3 @@ protected:
}; };
extern WorldGuildManager guild_mgr; extern WorldGuildManager guild_mgr;
#endif /*WGUILD_MGR_H_*/

59
world/world_boot.cpp
View File

@ -1,33 +1,34 @@
#include "../common/content/world_content_service.h"
#include "../common/emu_constants.h"
#include "../common/eqemu_logsys.h"
#include "../common/http/httplib.h"
#include "../common/http/uri.h"
#include "../common/net/console_server.h"
#include "../common/net/servertalk_server.h"
#include "../common/repositories/character_expedition_lockouts_repository.h"
#include "../common/repositories/character_task_timers_repository.h"
#include "../common/rulesys.h"
#include "../common/strings.h"
#include "adventure_manager.h"
#include "dynamic_zone_manager.h"
#include "login_server_list.h"
#include "shared_task_manager.h"
#include "ucs.h"
#include "wguild_mgr.h"
#include "world_boot.h" #include "world_boot.h"
#include "world_config.h"
#include "world_event_scheduler.h" #include "common/content/world_content_service.h"
#include "world_server_cli.h" #include "common/database/database_update.h"
#include "../common/zone_store.h" #include "common/emu_constants.h"
#include "worlddb.h" #include "common/eqemu_logsys.h"
#include "zonelist.h" #include "common/http/httplib.h"
#include "zoneserver.h" #include "common/http/uri.h"
#include "../common/ip_util.h" #include "common/ip_util.h"
#include "../common/zone_store.h" #include "common/net/console_server.h"
#include "../common/path_manager.h" #include "common/net/servertalk_server.h"
#include "../common/database/database_update.h" #include "common/path_manager.h"
#include "../common/repositories/zone_state_spawns_repository.h" #include "common/repositories/character_expedition_lockouts_repository.h"
#include "common/repositories/character_task_timers_repository.h"
#include "common/repositories/zone_state_spawns_repository.h"
#include "common/rulesys.h"
#include "common/strings.h"
#include "common/zone_store.h"
#include "common/zone_store.h"
#include "world/adventure_manager.h"
#include "world/dynamic_zone_manager.h"
#include "world/login_server_list.h"
#include "world/shared_task_manager.h"
#include "world/ucs.h"
#include "world/wguild_mgr.h"
#include "world/world_config.h"
#include "world/world_event_scheduler.h"
#include "world/world_server_cli.h"
#include "world/worlddb.h"
#include "world/zonelist.h"
#include "world/zoneserver.h"
extern WorldConfig Config; extern WorldConfig Config;

13
world/world_boot.h
View File

@ -1,10 +1,10 @@
#ifndef EQEMU_WORLD_BOOT_H #pragma once
#define EQEMU_WORLD_BOOT_H
#include "common/discord/discord.h"
#include "common/types.h"
#include "world/ucs.h"
#include <string> #include <string>
#include "../common/types.h"
#include "../common/discord/discord.h"
#include "ucs.h"
class WorldBoot { class WorldBoot {
public: public:
@ -27,6 +27,3 @@ public:
SendDiscordMessage(webhook_id, message_prefix + Discord::FormatDiscordMessage(log_category, message)); SendDiscordMessage(webhook_id, message_prefix + Discord::FormatDiscordMessage(log_category, message));
}; };
}; };
#endif //EQEMU_WORLD_BOOT_H

6
world/world_config.cpp
View File

@ -15,10 +15,11 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
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/global_define.h"
#include "../common/eqemu_logsys.h"
#include "world_config.h" #include "world_config.h"
#include "common/eqemu_logsys.h"
WorldConfig *WorldConfig::_world_config = nullptr; WorldConfig *WorldConfig::_world_config = nullptr;
std::string WorldConfig::GetByName(const std::string &var_name) const std::string WorldConfig::GetByName(const std::string &var_name) const
@ -31,4 +32,3 @@ std::string WorldConfig::GetByName(const std::string &var_name) const
} }
return (EQEmuConfig::GetByName(var_name)); return (EQEmuConfig::GetByName(var_name));
} }

8
world/world_config.h
View File

@ -15,10 +15,10 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
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 __WorldConfig_H
#define __WorldConfig_H
#include "../common/eqemu_config.h" #pragma once
#include "common/eqemu_config.h"
class WorldConfig : public EQEmuConfig { class WorldConfig : public EQEmuConfig {
public: public:
@ -64,5 +64,3 @@ public:
void Dump() const; void Dump() const;
}; };
#endif

5
world/world_console_connection.cpp
View File

@ -1,6 +1,7 @@
#include "world_console_connection.h" #include "world_console_connection.h"
#include <string.h>
#include <stdarg.h> #include <cstring>
#include <cstdarg>
void WorldConsoleTCPConnection::SendEmoteMessage(const char *to, uint32 to_guilddbid, int16 to_minstatus, uint32 type, const char *message, ...) void WorldConsoleTCPConnection::SendEmoteMessage(const char *to, uint32 to_guilddbid, int16 to_minstatus, uint32 type, const char *message, ...)
{ {

6
world/world_console_connection.h
View File

@ -15,10 +15,11 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#pragma once #pragma once
#include "world_tcp_connection.h" #include "common/net/console_server_connection.h"
#include "../common/net/console_server_connection.h" #include "world/world_tcp_connection.h"
class WorldConsoleTCPConnection : public WorldTCPConnection class WorldConsoleTCPConnection : public WorldTCPConnection
{ {
@ -33,4 +34,3 @@ public:
private: private:
EQ::Net::ConsoleServerConnection *m_connection; EQ::Net::ConsoleServerConnection *m_connection;
}; };

8
world/world_event_scheduler.cpp
View File

@ -1,8 +1,10 @@
#include "world_event_scheduler.h" #include "world_event_scheduler.h"
#include "../common/servertalk.h"
#include "common/rulesys.h"
#include "common/server_reload_types.h"
#include "common/servertalk.h"
#include <ctime> #include <ctime>
#include "../common/rulesys.h"
#include "../common/server_reload_types.h"
void WorldEventScheduler::Process(ZSList *zs_list) void WorldEventScheduler::Process(ZSList *zs_list)
{ {

9
world/world_event_scheduler.h
View File

@ -1,8 +1,7 @@
#ifndef EQEMU_EVENT_SCHEDULER_H #pragma once
#define EQEMU_EVENT_SCHEDULER_H
#include "../common/server_event_scheduler.h" #include "common/server_event_scheduler.h"
#include "zonelist.h" #include "world/zonelist.h"
class WorldEventScheduler : public ServerEventScheduler { class WorldEventScheduler : public ServerEventScheduler {
public: public:
@ -14,5 +13,3 @@ public:
return &instance; return &instance;
} }
}; };
#endif //EQEMU_EVENT_SCHEDULER_H

5
world/world_server_cli.cpp
View File

@ -1,9 +1,5 @@
#include "world_server_cli.h" #include "world_server_cli.h"
/**
* @param argc
* @param argv
*/
void WorldserverCLI::CommandHandler(int argc, char **argv) void WorldserverCLI::CommandHandler(int argc, char **argv)
{ {
if (argc == 1) { return; } if (argc == 1) { return; }
@ -38,4 +34,3 @@ void WorldserverCLI::CommandHandler(int argc, char **argv)
EQEmuCommand::HandleMenu(function_map, cmd, argc, argv); EQEmuCommand::HandleMenu(function_map, cmd, argc, argv);
} }

10
world/world_server_cli.h
View File

@ -1,8 +1,7 @@
#include "iostream"
#include "../common/cli/eqemu_command_handler.h"
#ifndef EQEMU_WORLD_SERVER_COMMAND_HANDLER_H #pragma once
#define EQEMU_WORLD_SERVER_COMMAND_HANDLER_H
#include "common/cli/eqemu_command_handler.h"
class WorldserverCLI { class WorldserverCLI {
public: public:
@ -27,6 +26,3 @@ public:
static void TestStringBenchmarkCommand(int argc, char **argv, argh::parser &cmd, std::string &description); static void TestStringBenchmarkCommand(int argc, char **argv, argh::parser &cmd, std::string &description);
static void EtlGetSettings(int argc, char **argv, argh::parser &cmd, std::string &description); static void EtlGetSettings(int argc, char **argv, argh::parser &cmd, std::string &description);
}; };
#endif //EQEMU_WORLD_SERVER_COMMAND_HANDLER_H

8
world/world_tcp_connection.h
View File

@ -15,10 +15,10 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
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 WorldTCPCONNECTION_H
#define WorldTCPCONNECTION_H
#include "../common/types.h" #pragma once
#include "common/types.h"
class WorldTCPConnection class WorldTCPConnection
{ {
@ -31,5 +31,3 @@ public:
virtual inline bool IsConsole() { return false; } virtual inline bool IsConsole() { return false; }
virtual inline bool IsZoneServer() { return false; } virtual inline bool IsZoneServer() { return false; }
}; };
#endif

29
world/worlddb.cpp
View File

@ -17,22 +17,23 @@
*/ */
#include "worlddb.h" #include "worlddb.h"
#include "../common/strings.h"
#include "../common/eq_packet_structs.h" #include "common/eq_packet_structs.h"
#include "../common/inventory_profile.h" #include "common/inventory_profile.h"
#include "../common/rulesys.h" #include "common/repositories/character_bind_repository.h"
#include <iostream> #include "common/repositories/character_data_repository.h"
#include "common/repositories/character_instance_safereturns_repository.h"
#include "common/repositories/character_material_repository.h"
#include "common/repositories/criteria/content_filter_criteria.h"
#include "common/repositories/inventory_repository.h"
#include "common/repositories/start_zones_repository.h"
#include "common/rulesys.h"
#include "common/strings.h"
#include "common/zone_store.h"
#include "world/sof_char_create_data.h"
#include <cstdlib> #include <cstdlib>
#include <vector> #include <vector>
#include "sof_char_create_data.h"
#include "../common/repositories/character_instance_safereturns_repository.h"
#include "../common/repositories/inventory_repository.h"
#include "../common/repositories/criteria/content_filter_criteria.h"
#include "../common/zone_store.h"
#include "../common/repositories/character_data_repository.h"
#include "../common/repositories/character_bind_repository.h"
#include "../common/repositories/character_material_repository.h"
#include "../common/repositories/start_zones_repository.h"
WorldDatabase database; WorldDatabase database;
WorldDatabase content_db; WorldDatabase content_db;

14
world/worlddb.h
View File

@ -15,13 +15,13 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
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 WORLDDB_H_
#define WORLDDB_H_
#include "../common/shareddb.h" #pragma once
#include "../common/eq_packet.h"
#include "../common/repositories/inventory_repository.h" #include "common/eq_packet.h"
#include "../common/repositories/character_data_repository.h" #include "common/repositories/character_data_repository.h"
#include "common/repositories/inventory_repository.h"
#include "common/shareddb.h"
struct PlayerProfile_Struct; struct PlayerProfile_Struct;
struct CharCreate_Struct; struct CharCreate_Struct;
@ -54,5 +54,3 @@ private:
extern WorldDatabase database; extern WorldDatabase database;
extern WorldDatabase content_db; extern WorldDatabase content_db;
#endif /*WORLDDB_H_*/

49
world/zonelist.cpp
View File

@ -15,31 +15,32 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
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/global_define.h"
#include "zonelist.h" #include "zonelist.h"
#include "zoneserver.h"
#include "worlddb.h" #include "common/content/world_content_service.h"
#include "world_config.h" #include "common/event_sub.h"
#include "../common/misc_functions.h" #include "common/events/player_event_logs.h"
#include "../common/servertalk.h" #include "common/json/json.h"
#include "../common/strings.h" #include "common/misc_functions.h"
#include "../common/random.h" #include "common/patches/patches.h"
#include "../common/json/json.h" #include "common/random.h"
#include "../common/event_sub.h" #include "common/repositories/buyer_repository.h"
#include "web_interface.h" #include "common/repositories/trader_repository.h"
#include "../common/zone_store.h" #include "common/servertalk.h"
#include "../common/events/player_event_logs.h" #include "common/skill_caps.h"
#include "../common/patches/patches.h" #include "common/strings.h"
#include "../common/skill_caps.h" #include "common/zone_store.h"
#include "../common/content/world_content_service.h" #include "world/clientlist.h"
#include "world_boot.h" #include "world/dynamic_zone_manager.h"
#include "shared_task_manager.h" #include "world/queryserv.h"
#include "dynamic_zone_manager.h" #include "world/shared_task_manager.h"
#include "ucs.h" #include "world/ucs.h"
#include "clientlist.h" #include "world/web_interface.h"
#include "queryserv.h" #include "world/world_boot.h"
#include "../common/repositories/trader_repository.h" #include "world/world_config.h"
#include "../common/repositories/buyer_repository.h" #include "world/worlddb.h"
#include "world/zoneserver.h"
extern uint32 numzones; extern uint32 numzones;
volatile bool UCSServerAvailable_ = false; volatile bool UCSServerAvailable_ = false;

21
world/zonelist.h
View File

@ -1,15 +1,15 @@
#ifndef ZONELIST_H_ #pragma once
#define ZONELIST_H_
#include "common/eqtime.h"
#include "common/event/timer.h"
#include "common/server_reload_types.h"
#include "common/timer.h"
#include "common/types.h"
#include "../common/types.h"
#include "../common/eqtime.h"
#include "../common/timer.h"
#include "../common/event/timer.h"
#include "../common/server_reload_types.h"
#include <vector>
#include <memory>
#include <deque> #include <deque>
#include <memory>
#include <mutex> #include <mutex>
#include <vector>
class WorldTCPConnection; class WorldTCPConnection;
class ServerPacket; class ServerPacket;
@ -97,6 +97,3 @@ private:
std::list<std::unique_ptr<ZoneServer>> zone_server_list; std::list<std::unique_ptr<ZoneServer>> zone_server_list;
}; };
#endif /*ZONELIST_H_*/

69
world/zoneserver.cpp
View File

@ -16,41 +16,42 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
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/global_define.h"
#include "zoneserver.h" #include "zoneserver.h"
#include "clientlist.h"
#include "login_server.h" #include "common/content/world_content_service.h"
#include "login_server_list.h" #include "common/events/player_event_logs.h"
#include "zonelist.h" #include "common/guilds.h"
#include "worlddb.h" #include "common/md5.h"
#include "client.h" #include "common/misc.h"
#include "../common/md5.h" #include "common/packet_dump.h"
#include "world_config.h" #include "common/patches/patches.h"
#include "../common/guilds.h" #include "common/repositories/buyer_repository.h"
#include "../common/packet_dump.h" #include "common/repositories/guild_tributes_repository.h"
#include "../common/misc.h" #include "common/repositories/player_event_logs_repository.h"
#include "../common/strings.h" #include "common/repositories/trader_repository.h"
#include "cliententry.h" #include "common/server_reload_types.h"
#include "wguild_mgr.h" #include "common/shared_tasks.h"
#include "lfplist.h" #include "common/skill_caps.h"
#include "adventure_manager.h" #include "common/strings.h"
#include "ucs.h" #include "common/zone_store.h"
#include "queryserv.h" #include "world/adventure_manager.h"
#include "../common/zone_store.h" #include "world/client.h"
#include "dynamic_zone.h" #include "world/cliententry.h"
#include "dynamic_zone_manager.h" #include "world/clientlist.h"
#include "shared_task_world_messaging.h" #include "world/dynamic_zone_manager.h"
#include "../common/shared_tasks.h" #include "world/dynamic_zone.h"
#include "shared_task_manager.h" #include "world/lfplist.h"
#include "../common/content/world_content_service.h" #include "world/login_server_list.h"
#include "../common/repositories/player_event_logs_repository.h" #include "world/login_server.h"
#include "../common/events/player_event_logs.h" #include "world/queryserv.h"
#include "../common/patches/patches.h" #include "world/shared_task_manager.h"
#include "../common/repositories/guild_tributes_repository.h" #include "world/shared_task_world_messaging.h"
#include "../common/skill_caps.h" #include "world/ucs.h"
#include "../common/server_reload_types.h" #include "world/wguild_mgr.h"
#include "../common/repositories/trader_repository.h" #include "world/world_config.h"
#include "../common/repositories/buyer_repository.h" #include "world/worlddb.h"
#include "world/zonelist.h"
extern GroupLFPList LFPGroupList; extern GroupLFPList LFPGroupList;
extern volatile bool RunLoops; extern volatile bool RunLoops;

21
world/zoneserver.h
View File

@ -15,16 +15,18 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
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 ZONESERVER_H
#define ZONESERVER_H #pragma once
#include "world_tcp_connection.h" #include "world_tcp_connection.h"
#include "../common/net/servertalk_server.h"
#include "../common/event/timer.h" #include "common/net/servertalk_server.h"
#include "../common/timer.h" #include "common/event/timer.h"
#include "../common/emu_constants.h" #include "common/timer.h"
#include "console.h" #include "common/emu_constants.h"
#include <string.h> #include "world/console.h"
#include <cstring>
#include <string> #include <string>
class Client; class Client;
@ -102,6 +104,3 @@ private:
std::string launched_name; //the name of the zone we launched. std::string launched_name; //the name of the zone we launched.
EQ::Net::ConsoleServer *console; EQ::Net::ConsoleServer *console;
}; };
#endif