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

normalize includes: common

Browse Source
This commit is contained in:
brainiac 2025-12-17 09:32:44 -08:00 committed by Alex
parent 723ca13482
commit 451eb0806a
295 changed files with 1592 additions and 2009 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/CMakeLists.txt
View File

@ -765,6 +765,7 @@ add_library(common ${common_sources} ${common_headers} ${repositories})
target_compile_definitions(common PUBLIC BOOST_BIND_GLOBAL_PLACEHOLDERS GLM_FORCE_RADIANS GLM_FORCE_CTOR_INIT GLM_ENABLE_EXPERIMENTAL ENABLE_SECURITY) target_compile_definitions(common PUBLIC BOOST_BIND_GLOBAL_PLACEHOLDERS GLM_FORCE_RADIANS GLM_FORCE_CTOR_INIT GLM_ENABLE_EXPERIMENTAL ENABLE_SECURITY)
target_include_directories(common PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../submodules/websocketpp") target_include_directories(common PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../submodules/websocketpp")
target_include_directories(common PRIVATE ..)
target_link_libraries(common PUBLIC cereal::cereal fmt::fmt unofficial::libmariadb $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv> OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB unofficial-sodium::sodium) target_link_libraries(common PUBLIC cereal::cereal fmt::fmt unofficial::libmariadb $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv> OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB unofficial-sodium::sodium)
# Requires libgoogle-perftools-dev google-perftools packages for linux (debian) # Requires libgoogle-perftools-dev google-perftools packages for linux (debian)

4
common/additive_lagged_fibonacci_engine.h
View File

@ -18,11 +18,11 @@
#pragma once #pragma once
#include <algorithm>
#include <cstdint> #include <cstdint>
#include <iostream>
#include <limits> #include <limits>
#include <type_traits> #include <type_traits>
#include <algorithm>
#include <iostream>
/* /*
* This is an additive lagged fibonacci generator as seen in The Art of Computer Programming, Vol. 2 * This is an additive lagged fibonacci generator as seen in The Art of Computer Programming, Vol. 2

8
common/base_packet.cpp
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 "global_define.h" #include "common/base_packet.h"
#include "base_packet.h" #include "common/global_define.h"
#include "misc.h" #include "common/misc.h"
#include "packet_dump.h" #include "common/packet_dump.h"
BasePacket::BasePacket(const unsigned char *buf, uint32 len) BasePacket::BasePacket(const unsigned char *buf, uint32 len)
{ {

16
common/base_packet.h
View File

@ -15,13 +15,14 @@
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 BASEPACKET_H_
#define BASEPACKET_H_
#include "types.h" #pragma once
#include "serialize_buffer.h"
#include <stdio.h> #include "common/serialize_buffer.h"
#include <string.h> #include "common/types.h"
#include <cstdio>
#include <cstring>
#ifdef _WINDOWS #ifdef _WINDOWS
#include <time.h> #include <time.h>
@ -93,6 +94,3 @@ protected:
extern void DumpPacketHex(const BasePacket* app); extern void DumpPacketHex(const BasePacket* app);
extern void DumpPacketAscii(const BasePacket* app); extern void DumpPacketAscii(const BasePacket* app);
extern void DumpPacketBin(const BasePacket* app); extern void DumpPacketBin(const BasePacket* app);
#endif /*BASEPACKET_H_*/

5
common/bazaar.cpp
View File

@ -1,7 +1,8 @@
#include "bazaar.h" #include "bazaar.h"
#include "../../common/item_instance.h" #include "common/item_instance.h"
#include "repositories/trader_repository.h" #include "common/repositories/trader_repository.h"
#include <memory> #include <memory>
std::vector<BazaarSearchResultsFromDB_Struct> std::vector<BazaarSearchResultsFromDB_Struct>

11
common/bazaar.h
View File

@ -1,9 +1,9 @@
#ifndef EQEMU_BAZAAR_H #pragma once
#define EQEMU_BAZAAR_H
#include "common/item_instance.h"
#include "common/shareddb.h"
#include <vector> #include <vector>
#include "shareddb.h"
#include "../../common/item_instance.h"
class Bazaar { class Bazaar {
public: public:
@ -11,6 +11,3 @@ public:
GetSearchResults(Database &content_db, Database &db, BazaarSearchCriteria_Struct search, unsigned int char_zone_id, int char_zone_instance_id); GetSearchResults(Database &content_db, Database &db, BazaarSearchCriteria_Struct search, unsigned int char_zone_id, int char_zone_instance_id);
}; };
#endif //EQEMU_BAZAAR_H

5
common/bodytypes.cpp
View File

@ -1,5 +1,6 @@
#include "../common/global_define.h" #include "bodytypes.h"
#include "../common/bodytypes.h"
#include "common/global_define.h"
std::string BodyType::GetName(uint8 body_type_id) std::string BodyType::GetName(uint8 body_type_id)
{ {

9
common/bodytypes.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
*/ */
#ifndef BODYTYPES_H
#define BODYTYPES_H
#include "types.h" #pragma once
#include "common/types.h"
#include <map> #include <map>
#include <string> #include <string>
@ -109,5 +110,3 @@ static std::map<uint8, std::string> body_type_names = {
{ BodyType::InvisibleMan, "Invisible Man" }, { BodyType::InvisibleMan, "Invisible Man" },
{ BodyType::Special, "Special" }, { BodyType::Special, "Special" },
}; };
#endif

12
common/classes.cpp
View File

@ -15,11 +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
*/ */
#include <fmt/format.h>
#include <fmt/ranges.h> #include "classes.h"
#include "../common/global_define.h"
#include "../common/classes.h" #include "common/data_verification.h"
#include "data_verification.h" #include "common/global_define.h"
#include "fmt/format.h"
const char *GetClassIDName(uint8 class_id, uint8 level) const char *GetClassIDName(uint8 class_id, uint8 level)
{ {

13
common/classes.h
View File

@ -15,13 +15,14 @@
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 CLASSES_CH
#define CLASSES_CH
#include "../common/types.h" #pragma once
#include "../common/rulesys.h"
#include <string> #include "common/rulesys.h"
#include "common/types.h"
#include <map> #include <map>
#include <string>
namespace Class { namespace Class {
constexpr uint8 None = 0; constexpr uint8 None = 0;
@ -156,5 +157,3 @@ bool IsChainClass(uint8 class_id);
bool IsLeatherClass(uint8 class_id); bool IsLeatherClass(uint8 class_id);
bool IsClothClass(uint8 class_id); bool IsClothClass(uint8 class_id);
uint8 ClassArmorType(uint8 class_id); uint8 ClassArmorType(uint8 class_id);
#endif

10
common/cli/eqemu_command_handler.cpp
View File

@ -18,11 +18,11 @@
* *
*/ */
#include <fmt/format.h> #include "common/cli/eqemu_command_handler.h"
#include <fmt/ranges.h> #include "common/cli/terminal_color.hpp"
#include "eqemu_command_handler.h" #include "common/platform.h"
#include "terminal_color.hpp"
#include "../platform.h" #include "fmt/format.h"
namespace EQEmuCommand { namespace EQEmuCommand {

11
common/compression.cpp
View File

@ -1,7 +1,10 @@
#include "global_define.h" #include "compression.h"
#include "types.h"
#include <string.h> #include "common/global_define.h"
#include <zlib.h> #include "common/types.h"
#include "zlib.h"
#include <cstring>
namespace EQ namespace EQ
{ {

2
common/compression.h
View File

@ -1,5 +1,7 @@
#pragma once #pragma once
#include "common/types.h"
namespace EQ namespace EQ
{ {
uint32 EstimateDeflateBuffer(uint32 len); uint32 EstimateDeflateBuffer(uint32 len);

11
common/condition.h
View File

@ -15,11 +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
*/ */
#ifndef __CONDITION_H
#define __CONDITION_H
#include "global_define.h" #pragma once
#include "mutex.h"
#include "common/global_define.h"
#include "common/mutex.h"
#ifndef WIN32 #ifndef WIN32
#include <pthread.h> #include <pthread.h>
#endif #endif
@ -52,6 +52,3 @@ class Condition {
// bool TimedWait(unsigned long usec); // bool TimedWait(unsigned long usec);
~Condition(); ~Condition();
}; };
#endif

14
common/content/world_content_service.cpp
View File

@ -1,13 +1,13 @@
#include "world_content_service.h" #include "world_content_service.h"
#include <utility> #include "common/database.h"
#include <glm/vec3.hpp> #include "common/eqemu_logsys.h"
#include "../database.h" #include "common/repositories/instance_list_repository.h"
#include "../rulesys.h" #include "common/rulesys.h"
#include "../eqemu_logsys.h" #include "common/zone_store.h"
#include "../repositories/instance_list_repository.h"
#include "../zone_store.h"
#include "glm/vec3.hpp"
#include <utility>
WorldContentService::WorldContentService() WorldContentService::WorldContentService()
{ {

13
common/content/world_content_service.h
View File

@ -1,11 +1,12 @@
#ifndef EQEMU_WORLD_CONTENT_SERVICE_H
#define EQEMU_WORLD_CONTENT_SERVICE_H #pragma once
#include "common/repositories/content_flags_repository.h"
#include "common/repositories/instance_list_repository.h"
#include "common/repositories/zone_repository.h"
#include <string> #include <string>
#include <vector> #include <vector>
#include "../repositories/content_flags_repository.h"
#include "../repositories/zone_repository.h"
#include "../repositories/instance_list_repository.h"
class Database; class Database;
@ -199,5 +200,3 @@ private:
WorldContentService *LoadStaticGlobalZoneInstances(); WorldContentService *LoadStaticGlobalZoneInstances();
std::vector<InstanceListRepository::InstanceList> m_zone_static_instances; std::vector<InstanceListRepository::InstanceList> m_zone_static_instances;
}; };
#endif //EQEMU_WORLD_CONTENT_SERVICE_H

25
common/crash.cpp
View File

@ -1,16 +1,17 @@
#include "global_define.h"
#include "eqemu_logsys.h"
#include "crash.h" #include "crash.h"
#include "strings.h"
#include "process/process.h" #include "common/eqemu_config.h"
#include "http/httplib.h" #include "common/eqemu_logsys.h"
#include "http/uri.h" #include "common/global_define.h"
#include "json/json.h" #include "common/http/httplib.h"
#include "version.h" #include "common/http/uri.h"
#include "eqemu_config.h" #include "common/json/json.h"
#include "serverinfo.h" #include "common/platform.h"
#include "rulesys.h" #include "common/process/process.h"
#include "platform.h" #include "common/rulesys.h"
#include "common/serverinfo.h"
#include "common/strings.h"
#include "common/version.h"
#include <cstdio> #include <cstdio>
#include <vector> #include <vector>

5
common/crash.h
View File

@ -1,6 +1,3 @@
#ifndef __EQEMU_CRASH_H #pragma once
#define __EQEMU_CRASH_H
void set_exception_handler(); void set_exception_handler();
#endif

5
common/crc16.cpp
View File

@ -1,4 +1,6 @@
#include "crc32.h" #include "crc16.h"
#include "common/crc32.h"
uint16 CRC16(const unsigned char *buf, int size, int key) uint16 CRC16(const unsigned char *buf, int size, int key)
{ {
@ -12,4 +14,3 @@ uint16 CRC16(const unsigned char *buf, int size, int key)
crc = CRC32::Update(buf, size, crc); crc = CRC32::Update(buf, size, crc);
return CRC32::Finish(crc) & 0xffff; return CRC32::Finish(crc) & 0xffff;
} }

8
common/crc16.h
View File

@ -1,7 +1,5 @@
#ifndef _CRC16_H #pragma once
#define _CRC16_H
#include "types.h" #include "common/types.h"
uint16 CRC16(const unsigned char *buf, int size, int key); uint16 CRC16(const unsigned char *buf, int size, int key);
#endif

3
common/crc32.cpp
View File

@ -1,5 +1,6 @@
#include "crc32.h" #include "crc32.h"
#include <assert.h>
#include <cassert>
#include <memory.h> #include <memory.h>
uint32 CRC32Table[256] = uint32 CRC32Table[256] =

7
common/crc32.h
View File

@ -1,6 +1,6 @@
#ifndef CRC32_H #pragma once
#define CRC32_H
#include "types.h" #include "common/types.h"
class CRC32 { class CRC32 {
public: public:
@ -17,4 +17,3 @@ public:
private: private:
static inline void Calc(const uint8 byte, uint32& crc32); static inline void Calc(const uint8 byte, uint32& crc32);
}; };
#endif

8
common/cron/croncpp.h
View File

@ -1,13 +1,13 @@
#pragma once #pragma once
#include <vector> #include <algorithm>
#include <string>
#include <sstream>
#include <bitset> #include <bitset>
#include <cctype> #include <cctype>
#include <ctime> #include <ctime>
#include <iomanip> #include <iomanip>
#include <algorithm> #include <sstream>
#include <string>
#include <vector>
#if __cplusplus > 201402L #if __cplusplus > 201402L
#include <string_view> #include <string_view>

11
common/data_bucket.cpp
View File

@ -1,8 +1,11 @@
#include "../common/data_bucket.h" #include "data_bucket.h"
#include "database.h"
#include <ctime> #include "common/data_bucket.h"
#include "common/database.h"
#include "common/json/json.hpp"
#include <cctype> #include <cctype>
#include "../common/json/json.hpp" #include <ctime>
using json = nlohmann::json; using json = nlohmann::json;

14
common/data_bucket.h
View File

@ -1,11 +1,11 @@
#ifndef EQEMU_DATABUCKET_H #pragma once
#define EQEMU_DATABUCKET_H
#include "common/json/json_archive_single_line.h"
#include "common/repositories/data_buckets_repository.h"
#include "common/shareddb.h"
#include "common/types.h"
#include <string> #include <string>
#include "types.h"
#include "repositories/data_buckets_repository.h"
#include "json/json_archive_single_line.h"
#include "shareddb.h"
struct DataBucketKey { struct DataBucketKey {
std::string key; std::string key;
@ -69,5 +69,3 @@ public:
static DataBucketsRepository::DataBuckets static DataBucketsRepository::DataBuckets
ExtractNestedValue(const DataBucketsRepository::DataBuckets &bucket, const std::string &full_key); ExtractNestedValue(const DataBucketsRepository::DataBuckets &bucket, const std::string &full_key);
}; };
#endif //EQEMU_DATABUCKET_H

91
common/database.cpp
View File

@ -16,42 +16,56 @@
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/data_verification.h"
#include "../common/rulesys.h" #include "common/database_schema.h"
#include "common/database.h"
#include "common/eq_packet_structs.h"
#include "common/events/player_event_logs.h"
#include "common/extprofile.h"
#include "common/global_define.h"
#include "common/http/httplib.h"
#include "common/http/uri.h"
#include "common/repositories/account_repository.h"
#include "common/repositories/adventure_stats_repository.h"
#include "common/repositories/bot_data_repository.h"
#include "common/repositories/buyer_repository.h"
#include "common/repositories/character_bind_repository.h"
#include "common/repositories/character_data_repository.h"
#include "common/repositories/character_languages_repository.h"
#include "common/repositories/character_leadership_abilities_repository.h"
#include "common/repositories/character_parcels_repository.h"
#include "common/repositories/character_pet_name_repository.h"
#include "common/repositories/character_skills_repository.h"
#include "common/repositories/data_buckets_repository.h"
#include "common/repositories/group_id_repository.h"
#include "common/repositories/group_leaders_repository.h"
#include "common/repositories/guild_members_repository.h"
#include "common/repositories/instance_list_repository.h"
#include "common/repositories/inventory_snapshots_repository.h"
#include "common/repositories/ip_exemptions_repository.h"
#include "common/repositories/merchantlist_temp_repository.h"
#include "common/repositories/name_filter_repository.h"
#include "common/repositories/npc_types_repository.h"
#include "common/repositories/raid_details_repository.h"
#include "common/repositories/raid_members_repository.h"
#include "common/repositories/reports_repository.h"
#include "common/repositories/trader_repository.h"
#include "common/repositories/variables_repository.h"
#include "common/repositories/zone_repository.h"
#include "common/rulesys.h"
#include "common/strings.h"
#include "common/zone_store.h"
#include "mysqld_error.h"
#include <ctype.h> #include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <iomanip> #include <iomanip>
#include <iostream> #include <iostream>
#include <map> #include <map>
#include <algorithm> #include <algorithm>
#include <mysqld_error.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "../common/repositories/account_repository.h"
#include "../common/repositories/adventure_stats_repository.h"
#include "../common/repositories/character_bind_repository.h"
#include "../common/repositories/character_data_repository.h"
#include "../common/repositories/character_languages_repository.h"
#include "../common/repositories/character_leadership_abilities_repository.h"
#include "../common/repositories/character_parcels_repository.h"
#include "../common/repositories/character_skills_repository.h"
#include "../common/repositories/data_buckets_repository.h"
#include "../common/repositories/group_id_repository.h"
#include "../common/repositories/group_leaders_repository.h"
#include "../common/repositories/guild_members_repository.h"
#include "../common/repositories/instance_list_repository.h"
#include "../common/repositories/inventory_snapshots_repository.h"
#include "../common/repositories/ip_exemptions_repository.h"
#include "../common/repositories/name_filter_repository.h"
#include "../common/repositories/npc_types_repository.h"
#include "../common/repositories/raid_details_repository.h"
#include "../common/repositories/raid_members_repository.h"
#include "../common/repositories/reports_repository.h"
#include "../common/repositories/variables_repository.h"
#include "../common/repositories/character_pet_name_repository.h"
#include "../common/events/player_event_logs.h"
// Disgrace: for windows compile // Disgrace: for windows compile
#ifdef _WINDOWS #ifdef _WINDOWS
@ -63,25 +77,8 @@
#include "unix.h" #include "unix.h"
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#include "database.h"
#include "data_verification.h"
#include "eq_packet_structs.h"
#include "extprofile.h"
#include "strings.h"
#include "database_schema.h"
#include "http/httplib.h"
#include "http/uri.h"
#include "repositories/zone_repository.h"
#include "zone_store.h"
#include "repositories/merchantlist_temp_repository.h"
#include "repositories/bot_data_repository.h"
#include "repositories/trader_repository.h"
#include "repositories/buyer_repository.h"
extern Client client; extern Client client;
Database::Database() { } Database::Database() { }

22
common/database.h
View File

@ -15,25 +15,23 @@
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 EQEMU_DATABASE_H
#define EQEMU_DATABASE_H
#define AUTHENTICATION_TIMEOUT 60 #pragma once
#define INVALID_ID 0xFFFFFFFF
#include "global_define.h" #include "common/dbcore.h"
#include "eqemu_logsys.h" #include "common/eq_packet_structs.h"
#include "common/eqemu_logsys.h"
#include "types.h" #include "common/global_define.h"
#include "dbcore.h" #include "common/linked_list.h"
#include "linked_list.h" #include "common/types.h"
#include "eq_packet_structs.h"
#include <cmath> #include <cmath>
#include <string> #include <string>
#include <vector> #include <vector>
#include <map> #include <map>
#define AUTHENTICATION_TIMEOUT 60
#define INVALID_ID 0xFFFFFFFF
class MySQLRequestResult; class MySQLRequestResult;
class Client; class Client;
@ -292,5 +290,3 @@ private:
void ClearAllRaidDetails(); void ClearAllRaidDetails();
void ClearAllRaidLeaders(); void ClearAllRaidLeaders();
}; };
#endif

23
common/database/database_dump_service.cpp
View File

@ -18,27 +18,26 @@
* *
*/ */
#include <string>
#include <cstdio>
#include <iterator>
#include "database_dump_service.h" #include "database_dump_service.h"
#include "../eqemu_logsys.h"
#include "../strings.h"
#include "../eqemu_config.h"
#include "../database_schema.h"
#include "../file.h"
#include "../process/process.h"
#include "../termcolor/rang.hpp"
#include "common/database_schema.h"
#include "common/eqemu_config.h"
#include "common/eqemu_logsys.h"
#include "common/file.h"
#include "common/process/process.h"
#include "common/strings.h"
#include "common/termcolor/rang.hpp"
#include <cstdio>
#include <ctime> #include <ctime>
#include <iterator>
#include <string>
#if _WIN32 #if _WIN32
#include <windows.h> #include <windows.h>
#else #else
#include <sys/time.h> #include <sys/time.h>
#include <thread> #include <thread>
#endif #endif
#define DATABASE_DUMP_PATH "backups/" #define DATABASE_DUMP_PATH "backups/"

7
common/database/database_dump_service.h
View File

@ -18,9 +18,9 @@
* *
*/ */
#ifndef EQEMU_DATABASE_DUMP_SERVICE_H #pragma once
#define EQEMU_DATABASE_DUMP_SERVICE_H
#include <string>
class DatabaseDumpService { class DatabaseDumpService {
public: public:
@ -97,6 +97,3 @@ private:
void BuildCredentialsFile(); void BuildCredentialsFile();
void RemoveCredentialsFile(); void RemoveCredentialsFile();
}; };
#endif //EQEMU_DATABASE_DUMP_SERVICE_H

23
common/database/database_update.cpp
View File

@ -1,14 +1,17 @@
#include <filesystem>
#include "database_update.h" #include "database_update.h"
#include "../eqemu_logsys.h"
#include "../database.h" #include "common/database.h"
#include "../strings.h" #include "common/database/database_dump_service.h"
#include "../rulesys.h" #include "common/database/database_update_manifest_bots.h"
#include "../http/httplib.h" #include "common/database/database_update_manifest_custom.h"
#include "database_dump_service.h" #include "common/database/database_update_manifest.h"
#include "database_update_manifest.h" #include "common/eqemu_logsys.h"
#include "database_update_manifest_custom.h" #include "common/http/httplib.h"
#include "database_update_manifest_bots.h" #include "common/rulesys.h"
#include "common/strings.h"
#include <filesystem>
constexpr int BREAK_LENGTH = 70; constexpr int BREAK_LENGTH = 70;

8
common/database/database_update.h
View File

@ -1,7 +1,6 @@
#ifndef EQEMU_DATABASE_UPDATE_H #pragma once
#define EQEMU_DATABASE_UPDATE_H
#include "../database.h" #include "common/database.h"
struct ManifestEntry { struct ManifestEntry {
int version{}; // database version of the migration int version{}; // database version of the migration
@ -47,7 +46,4 @@ private:
static bool CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b); static bool CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b);
void InjectBotsVersionColumn(); void InjectBotsVersionColumn();
void InjectCustomVersionColumn(); void InjectCustomVersionColumn();
}; };
#endif //EQEMU_DATABASE_UPDATE_H

4
common/database/database_update_manifest.h
View File

@ -1,5 +1,9 @@
#pragma once #pragma once
#include "common/database/database_update.h"
#include <vector>
std::vector<ManifestEntry> manifest_entries = { std::vector<ManifestEntry> manifest_entries = {
ManifestEntry{ ManifestEntry{
.version = 9000, .version = 9000,

4
common/database/database_update_manifest_bots.h
View File

@ -1,5 +1,9 @@
#pragma once #pragma once
#include "common/database/database_update.h"
#include <vector>
std::vector<ManifestEntry> bot_manifest_entries = { std::vector<ManifestEntry> bot_manifest_entries = {
ManifestEntry{ ManifestEntry{
.version = 9035, .version = 9035,

4
common/database/database_update_manifest_custom.h
View File

@ -1,5 +1,9 @@
#pragma once #pragma once
#include "common/database/database_update.h"
#include <vector>
std::vector<ManifestEntry> manifest_entries_custom = { std::vector<ManifestEntry> manifest_entries_custom = {
ManifestEntry{ ManifestEntry{
.version = 1, .version = 1,

37
common/database_instances.cpp
View File

@ -16,24 +16,25 @@ 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/rulesys.h"
#include "../common/strings.h"
#include "../common/timer.h"
#include "../common/repositories/character_corpses_repository.h"
#include "../common/repositories/dynamic_zone_members_repository.h"
#include "../common/repositories/dynamic_zones_repository.h"
#include "../common/repositories/group_id_repository.h"
#include "../common/repositories/instance_list_repository.h"
#include "../common/repositories/instance_list_player_repository.h"
#include "../common/repositories/raid_members_repository.h"
#include "../common/repositories/respawn_times_repository.h"
#include "../common/repositories/spawn_condition_values_repository.h"
#include "repositories/spawn2_disabled_repository.h"
#include "repositories/data_buckets_repository.h"
#include "repositories/zone_state_spawns_repository.h"
#include "database.h" #include "database.h"
#include "common/global_define.h"
#include "common/repositories/character_corpses_repository.h"
#include "common/repositories/data_buckets_repository.h"
#include "common/repositories/dynamic_zone_members_repository.h"
#include "common/repositories/dynamic_zones_repository.h"
#include "common/repositories/group_id_repository.h"
#include "common/repositories/instance_list_player_repository.h"
#include "common/repositories/instance_list_repository.h"
#include "common/repositories/raid_members_repository.h"
#include "common/repositories/respawn_times_repository.h"
#include "common/repositories/spawn_condition_values_repository.h"
#include "common/repositories/spawn2_disabled_repository.h"
#include "common/repositories/zone_state_spawns_repository.h"
#include "common/rulesys.h"
#include "common/strings.h"
#include "common/timer.h"
#include <iomanip> #include <iomanip>
#include <iostream> #include <iostream>
@ -44,8 +45,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#define strncasecmp _strnicmp #define strncasecmp _strnicmp
#define strcasecmp _stricmp #define strcasecmp _stricmp
#else #else
#include "unix.h" #include "common/unix.h"
#include "../zone/zonedb.h" #include "zone/zonedb.h"
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/time.h> #include <sys/time.h>
#endif #endif

5
common/database_schema.h
View File

@ -18,8 +18,7 @@
* *
*/ */
#ifndef EQEMU_DATABASE_SCHEMA_H #pragma once
#define EQEMU_DATABASE_SCHEMA_H
#include <vector> #include <vector>
#include <map> #include <map>
@ -438,5 +437,3 @@ namespace DatabaseSchema {
} }
} }
#endif //EQEMU_DATABASE_SCHEMA_H

24
common/dbcore.cpp
View File

@ -1,30 +1,26 @@
#ifdef _WINDOWS
#include <winsock2.h>
#endif
#include "misc_functions.h"
#include "eqemu_logsys.h"
#include "timer.h"
#include "dbcore.h" #include "dbcore.h"
#include "mysql_stmt.h"
#include "common/eqemu_logsys.h"
#include "common/misc_functions.h"
#include "common/mysql_stmt.h"
#include "common/strings.h"
#include "common/timer.h"
#include "mysqld_error.h"
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <mysqld_error.h>
#include <string.h> #include <string.h>
#include "strings.h"
#ifdef _WINDOWS #ifdef _WINDOWS
#define snprintf _snprintf #define snprintf _snprintf
#define strncasecmp _strnicmp #define strncasecmp _strnicmp
#define strcasecmp _stricmp #define strcasecmp _stricmp
#include <process.h> #include <process.h>
#include <winsock2.h>
#else #else
#include "common/unix.h"
#include "unix.h"
#include <pthread.h> #include <pthread.h>
#endif #endif
#ifdef _EQDEBUG #ifdef _EQDEBUG

18
common/dbcore.h
View File

@ -1,16 +1,11 @@
#ifndef DBCORE_H #pragma once
#define DBCORE_H
#ifdef _WINDOWS #include "common/mutex.h"
#include <winsock2.h> #include "common/mysql_request_result.h"
#include <windows.h> #include "common/types.h"
#endif
#include "../common/mutex.h" #include "mysql.h"
#include "../common/mysql_request_result.h"
#include "../common/types.h"
#include <mysql.h>
#include <string.h> #include <string.h>
#include <mutex> #include <mutex>
@ -102,6 +97,3 @@ private:
mysql_set_server_option(mysql, MYSQL_OPTION_MULTI_STATEMENTS_OFF); mysql_set_server_option(mysql, MYSQL_OPTION_MULTI_STATEMENTS_OFF);
} }
}; };
#endif

8
common/deity.h
View File

@ -17,10 +17,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
*/ */
#ifndef COMMON_DEITY_H #pragma once
#define COMMON_DEITY_H
#include "common/types.h"
#include "types.h"
#include <map> #include <map>
#include <string> #include <string>
#include <limits> #include <limits>
@ -113,5 +113,3 @@ static std::map<uint32, uint32> deity_bitmasks = {
{ Deity::Tunare, Deity::Bitmask::Tunare }, { Deity::Tunare, Deity::Bitmask::Tunare },
{ Deity::Veeshan, Deity::Bitmask::Veeshan } { Deity::Veeshan, Deity::Bitmask::Veeshan }
}; };
#endif /* COMMON_DEITY_H */

16
common/discord/discord.cpp
View File

@ -1,11 +1,13 @@
#include <cereal/archives/json.hpp>
#include <cereal/archives/binary.hpp>
#include "discord.h" #include "discord.h"
#include "../http/httplib.h"
#include "../json/json.h" #include "common/eqemu_logsys.h"
#include "../strings.h" #include "common/events/player_event_logs.h"
#include "../eqemu_logsys.h" #include "common/http/httplib.h"
#include "../events/player_event_logs.h" #include "common/json/json.h"
#include "common/strings.h"
#include "cereal/archives/binary.hpp"
#include "cereal/archives/json.hpp"
constexpr int MAX_RETRIES = 10; constexpr int MAX_RETRIES = 10;

15
common/discord/discord.h
View File

@ -1,19 +1,16 @@
#ifndef EQEMU_DISCORD_H #pragma once
#define EQEMU_DISCORD_H
#include "common/events/player_events.h"
#include "common/repositories/player_event_logs_repository.h"
#include "common/types.h"
#include <string> #include <string>
#include "../types.h"
#include "../repositories/player_event_logs_repository.h"
#include "../events/player_events.h"
class Discord { class Discord
{
public: public:
static void SendWebhookMessage(const std::string& message, const std::string& webhook_url); static void SendWebhookMessage(const std::string& message, const std::string& webhook_url);
static std::string FormatDiscordMessage(uint16 category_id, const std::string& message); static std::string FormatDiscordMessage(uint16 category_id, const std::string& message);
static void SendPlayerEventMessage(const PlayerEvent::PlayerEventContainer& e, const std::string &webhook_url); static void SendPlayerEventMessage(const PlayerEvent::PlayerEventContainer& e, const std::string &webhook_url);
static bool ValidateWebhookUrl(const std::string &webhook_url); static bool ValidateWebhookUrl(const std::string &webhook_url);
}; };
#endif //EQEMU_DISCORD_H

5
common/discord/discord_manager.cpp
View File

@ -1,6 +1,7 @@
#include "discord_manager.h" #include "discord_manager.h"
#include "../../common/discord/discord.h"
#include "../events/player_event_logs.h" #include "common/discord/discord.h"
#include "common/events/player_event_logs.h"
void DiscordManager::QueueWebhookMessage(uint32 webhook_id, const std::string &message) void DiscordManager::QueueWebhookMessage(uint32 webhook_id, const std::string &message)
{ {

19
common/discord/discord_manager.h
View File

@ -1,14 +1,16 @@
#ifndef EQEMU_DISCORD_MANAGER_H
#define EQEMU_DISCORD_MANAGER_H
#include <mutex> #pragma once
#include "common/events/player_events.h"
#include "common/repositories/player_event_logs_repository.h"
#include "common/types.h"
#include <map> #include <map>
#include <mutex>
#include <vector> #include <vector>
#include "../../common/types.h"
#include "../repositories/player_event_logs_repository.h"
#include "../events/player_events.h"
class DiscordManager { class DiscordManager
{
public: public:
void QueueWebhookMessage(uint32 webhook_id, const std::string& message); void QueueWebhookMessage(uint32 webhook_id, const std::string& message);
void ProcessMessageQueue(); void ProcessMessageQueue();
@ -23,6 +25,3 @@ private:
std::mutex webhook_queue_lock{}; std::mutex webhook_queue_lock{};
std::map<uint32, std::vector<std::string>> webhook_message_queue{}; std::map<uint32, std::vector<std::string>> webhook_message_queue{};
}; };
#endif

19
common/dynamic_zone_base.cpp
View File

@ -1,13 +1,14 @@
#include "dynamic_zone_base.h" #include "dynamic_zone_base.h"
#include "database.h"
#include "eqemu_logsys.h" #include "common/database.h"
#include "rulesys.h" #include "common/eqemu_logsys.h"
#include "servertalk.h" #include "common/repositories/character_expedition_lockouts_repository.h"
#include "util/uuid.h" #include "common/repositories/dynamic_zone_lockouts_repository.h"
#include "repositories/character_expedition_lockouts_repository.h" #include "common/repositories/instance_list_player_repository.h"
#include "repositories/dynamic_zone_lockouts_repository.h" #include "common/repositories/instance_list_repository.h"
#include "repositories/instance_list_repository.h" #include "common/rulesys.h"
#include "repositories/instance_list_player_repository.h" #include "common/servertalk.h"
#include "common/util/uuid.h"
DynamicZoneBase::DynamicZoneBase(DynamicZonesRepository::DynamicZoneInstance&& entry) DynamicZoneBase::DynamicZoneBase(DynamicZonesRepository::DynamicZoneInstance&& entry)
{ {

16
common/dynamic_zone_base.h
View File

@ -1,11 +1,11 @@
#ifndef COMMON_DYNAMIC_ZONE_BASE_H #pragma once
#define COMMON_DYNAMIC_ZONE_BASE_H
#include "common/dynamic_zone_lockout.h"
#include "common/eq_constants.h"
#include "common/repositories/dynamic_zone_members_repository.h"
#include "common/repositories/dynamic_zone_templates_repository.h"
#include "common/repositories/dynamic_zones_repository.h"
#include "dynamic_zone_lockout.h"
#include "eq_constants.h"
#include "repositories/dynamic_zones_repository.h"
#include "repositories/dynamic_zone_members_repository.h"
#include "repositories/dynamic_zone_templates_repository.h"
#include <algorithm> #include <algorithm>
#include <chrono> #include <chrono>
#include <cstdint> #include <cstdint>
@ -270,5 +270,3 @@ public:
); );
} }
}; };
#endif

9
common/dynamic_zone_lockout.cpp
View File

@ -1,10 +1,11 @@
#include "dynamic_zone_lockout.h" #include "dynamic_zone_lockout.h"
#include "strings.h"
#include "rulesys.h" #include "rulesys.h"
#include "strings.h"
#include "util/uuid.h" #include "util/uuid.h"
#include <fmt/format.h>
#include <fmt/ranges.h> #include "fmt/format.h"
#include <cereal/types/chrono.hpp> #include "cereal/types/chrono.hpp"
#include "cereal/archives/binary.hpp"
DzLockout::DzLockout(std::string uuid, std::string expedition, std::string event, uint64_t expire_time, uint32_t duration) DzLockout::DzLockout(std::string uuid, std::string expedition, std::string event, uint64_t expire_time, uint32_t duration)
: m_uuid(std::move(uuid)) : m_uuid(std::move(uuid))

3
common/dynamic_zone_lockout.h
View File

@ -1,8 +1,9 @@
#pragma once #pragma once
#include "repositories/base/base_dynamic_zone_lockouts_repository.h"
#include <chrono> #include <chrono>
#include <string> #include <string>
#include "repositories/base/base_dynamic_zone_lockouts_repository.h"
class DzLockout class DzLockout
{ {

12
common/emu_constants.cpp
View File

@ -17,12 +17,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
*/ */
#include "emu_constants.h" #include "common/bodytypes.h"
#include "bodytypes.h" #include "common/data_verification.h"
#include "data_verification.h" #include "common/emu_constants.h"
#include "eqemu_logsys.h" #include "common/eqemu_logsys_log_aliases.h"
#include "eqemu_logsys_log_aliases.h" #include "common/eqemu_logsys.h"
#include "rulesys.h" #include "common/rulesys.h"
int16 EQ::invtype::GetInvTypeSize(int16 inv_type) { int16 EQ::invtype::GetInvTypeSize(int16 inv_type) {
static const int16 local_array[] = { static const int16 local_array[] = {

13
common/emu_constants.h
View File

@ -17,14 +17,13 @@
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 COMMON_EMU_CONSTANTS_H #pragma once
#define COMMON_EMU_CONSTANTS_H
#include "eq_limits.h" #include "common/bodytypes.h"
#include "emu_versions.h" #include "common/emu_versions.h"
#include "bodytypes.h" #include "common/eq_limits.h"
#include <string.h> #include <cstring>
namespace AccountStatus { namespace AccountStatus {
constexpr uint8 Player = 0; constexpr uint8 Player = 0;
@ -918,5 +917,3 @@ namespace PetType {
std::string GetName(uint8 pet_type); std::string GetName(uint8 pet_type);
bool IsValid(uint8 pet_type); bool IsValid(uint8 pet_type);
} }
#endif /*COMMON_EMU_CONSTANTS_H*/

9
common/emu_limits.h
View File

@ -17,12 +17,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
*/ */
#ifndef COMMON_EMU_LIMITS_H #pragma once
#define COMMON_EMU_LIMITS_H
#include "types.h" #include "common/types.h"
#include <stdlib.h> #include <cstdlib>
namespace EntityLimits namespace EntityLimits
@ -124,5 +123,3 @@ namespace EntityLimits
} /*Pet*/ } /*Pet*/
}; /*EntityLimits*/ }; /*EntityLimits*/
#endif /*COMMON_EMU_LIMITS_H*/

10
common/emu_opcodes.cpp
View File

@ -16,8 +16,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 04111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 04111-1307 USA
*/ */
#include "global_define.h" #include "common/emu_opcodes.h"
#include "emu_opcodes.h" #include "common/global_define.h"
const char *OpcodeNames[_maxEmuOpcode+1] = { const char *OpcodeNames[_maxEmuOpcode+1] = {
"OP_Unknown", "OP_Unknown",
@ -30,9 +30,3 @@ const char *OpcodeNames[_maxEmuOpcode+1] = {
"" ""
}; };

7
common/emu_opcodes.h
View File

@ -15,8 +15,8 @@ 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 04111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 04111-1307 USA
*/ */
#ifndef EMU_OPCODES_H
#define EMU_OPCODES_H #pragma once
//this is the highest opcode possibly used in the regular EQ protocol //this is the highest opcode possibly used in the regular EQ protocol
#define MAX_EQ_OPCODE 0xFFFF #define MAX_EQ_OPCODE 0xFFFF
@ -47,6 +47,3 @@ typedef enum { //EQEmu internal opcodes list
constexpr int format_as(EmuOpcode opcode) { return static_cast<int>(opcode); } constexpr int format_as(EmuOpcode opcode) { return static_cast<int>(opcode); }
extern const char *OpcodeNames[_maxEmuOpcode+1]; extern const char *OpcodeNames[_maxEmuOpcode+1];
#endif

4
common/emu_versions.cpp
View File

@ -17,8 +17,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 "emu_versions.h" #include "common/emu_versions.h"
#include "emu_constants.h" #include "common/emu_constants.h"
bool EQ::versions::IsValidClientVersion(ClientVersion client_version) bool EQ::versions::IsValidClientVersion(ClientVersion client_version)

10
common/emu_versions.h
View File

@ -17,13 +17,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
*/ */
#ifndef COMMON_EMU_VERSIONS_H #pragma once
#define COMMON_EMU_VERSIONS_H
#include "types.h" #include "common/types.h"
#include <stdlib.h>
#include <cstdlib>
namespace EQ namespace EQ
{ {
@ -218,5 +216,3 @@ namespace EQ
} /*expansions*/ } /*expansions*/
} /*EQEmu*/ } /*EQEmu*/
#endif /*COMMON_EMU_VERSIONS_H*/

9
common/eq_constants.h
View File

@ -17,11 +17,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
*/ */
#ifndef COMMON_EQ_CONSTANTS_H #pragma once
#define COMMON_EQ_CONSTANTS_H
#include "skills.h" #include "common/skills.h"
#include "types.h" #include "common/types.h"
namespace AppearanceType { namespace AppearanceType {
constexpr uint32 Die = 0; // Causes the client to keel over and zone to bind point (default action) constexpr uint32 Die = 0; // Causes the client to keel over and zone to bind point (default action)
@ -1096,5 +1095,3 @@ enum ExpSource
namespace DoorType { namespace DoorType {
constexpr uint32 BuyerStall = 155; constexpr uint32 BuyerStall = 155;
} }
#endif /*COMMON_EQ_CONSTANTS_H*/

6
common/eq_limits.cpp
View File

@ -17,9 +17,9 @@
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 "emu_constants.h" #include "common/emu_constants.h"
#include "emu_limits.h" #include "common/emu_limits.h"
#include "rulesys.h" #include "common/rulesys.h"
#include <memory> #include <memory>

23
common/eq_limits.h
View File

@ -17,18 +17,17 @@
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 COMMON_EQ_LIMITS_H #pragma once
#define COMMON_EQ_LIMITS_H
#include "types.h" #include "common/emu_versions.h"
#include "eq_constants.h" #include "common/eq_constants.h"
#include "emu_versions.h" #include "common/patches/rof_limits.h"
#include "../common/patches/titanium_limits.h" #include "common/patches/rof2_limits.h"
#include "../common/patches/sof_limits.h" #include "common/patches/sod_limits.h"
#include "../common/patches/sod_limits.h" #include "common/patches/sof_limits.h"
#include "../common/patches/uf_limits.h" #include "common/patches/titanium_limits.h"
#include "../common/patches/rof_limits.h" #include "common/patches/uf_limits.h"
#include "../common/patches/rof2_limits.h" #include "common/types.h"
namespace EQ namespace EQ
@ -268,5 +267,3 @@ namespace Client62
} // namespace constants } // namespace constants
} /*Client62*/ } /*Client62*/
#endif /*COMMON_EQ_LIMITS_H*/

22
common/eq_packet.cpp
View File

@ -16,25 +16,19 @@
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 "crc16.h"
#include "global_define.h"
#include "eq_packet.h" #include "eq_packet.h"
#include "misc.h"
#include "op_codes.h"
#include "platform.h"
#include <iomanip>
#include <iostream>
#include <sstream>
#include <stdio.h>
#include "common/global_define.h"
#include "common/misc.h"
#include "common/op_codes.h"
#ifndef STATIC_OPCODE #ifndef STATIC_OPCODE
#include "opcodemgr.h" #include "common/opcodemgr.h"
#endif #endif
#include "common/packet_dump.h"
#include "common/packet_functions.h"
#include "common/platform.h"
#include "packet_dump.h" #include <cstdio>
#include "packet_functions.h"
#include <cstdlib>
#include <cstring>
EQPacket::EQPacket(EmuOpcode op, const unsigned char *buf, uint32 len) EQPacket::EQPacket(EmuOpcode op, const unsigned char *buf, uint32 len)
: BasePacket(buf, len), : BasePacket(buf, len),

13
common/eq_packet.h
View File

@ -15,18 +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 _EQPACKET_H
#define _EQPACKET_H
#include "base_packet.h" #pragma once
#include "platform.h"
#include <iostream> #include "common/base_packet.h"
#include "common/platform.h"
#ifdef STATIC_OPCODE #ifdef STATIC_OPCODE
typedef unsigned short EmuOpcode; typedef unsigned short EmuOpcode;
static const EmuOpcode OP_Unknown = 0; static const EmuOpcode OP_Unknown = 0;
#else #else
#include "emu_opcodes.h" #include "common/emu_opcodes.h"
#endif #endif
class EQPacket : public BasePacket { class EQPacket : public BasePacket {
@ -152,5 +151,3 @@ protected:
extern void DumpPacket(const EQApplicationPacket* app, bool iShowInfo = false); extern void DumpPacket(const EQApplicationPacket* app, bool iShowInfo = false);
extern std::string DumpPacketToString(const EQApplicationPacket* app); extern std::string DumpPacketToString(const EQApplicationPacket* app);
#endif

28
common/eq_packet_structs.h
View File

@ -16,20 +16,20 @@
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 EQ_PACKET_STRUCTS_H #pragma once
#define EQ_PACKET_STRUCTS_H
#include "common/emu_constants.h"
#include "common/textures.h"
#include "common/types.h"
#include "common/version.h"
#include "cereal/archives/binary.hpp"
#include "cereal/types/string.hpp"
#include "cereal/types/vector.hpp"
#include <list> #include <list>
#include <string.h> #include <cstring>
#include <string> #include <string>
#include <time.h> #include <ctime>
#include <cereal/archives/binary.hpp>
#include <cereal/types/string.hpp>
#include <cereal/types/vector.hpp>
#include "../common/version.h"
#include "emu_constants.h"
#include "textures.h"
#include "types.h"
static const uint32 BUFF_COUNT = 42; static const uint32 BUFF_COUNT = 42;
static const uint32 PET_BUFF_COUNT = 30; static const uint32 PET_BUFF_COUNT = 30;
@ -45,6 +45,7 @@ static const uint32 ADVANCED_LORE_LENGTH = 8192;
** Compiler override to ensure ** Compiler override to ensure
** byte aligned structures ** byte aligned structures
*/ */
#pragma pack(push)
#pragma pack(1) #pragma pack(1)
struct LoginInfo { struct LoginInfo {
@ -6562,7 +6563,4 @@ struct EvolveGetNextItem {
}; };
// Restore structure packing to default // Restore structure packing to default
#pragma pack() #pragma pack(pop)
#endif

40
common/eq_stream.cpp
View File

@ -16,31 +16,32 @@
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 "global_define.h"
#include "eqemu_logsys.h"
#include "eq_packet.h"
#include "eq_stream.h" #include "eq_stream.h"
#include "op_codes.h"
#include "crc16.h"
#include "platform.h"
#include "strings.h"
#include <string> #include "common/crc16.h"
#include <iomanip> #include "common/eq_packet.h"
#include <vector> #include "common/eqemu_logsys.h"
#include "common/global_define.h"
#include "common/op_codes.h"
#include "common/platform.h"
#include "common/strings.h"
#include <algorithm> #include <algorithm>
#include <iomanip>
#include <string>
#include <vector>
#ifdef _WINDOWS #ifdef _WINDOWS
#include <time.h> #include <time.h>
#else #else
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netdb.h> #include <netdb.h>
#include <fcntl.h> #include <fcntl.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#endif #endif
//for logsys //for logsys
@ -1437,4 +1438,3 @@ EQStream::MatchState EQStream::CheckSignature(const Signature *sig) {
return(res); return(res);
} }

27
common/eq_stream.h
View File

@ -1,24 +1,22 @@
#ifndef _EQSTREAM_H #pragma once
#define _EQSTREAM_H
#include <vector> #include "common/eq_packet.h"
#include "common/eq_stream_intf.h"
#include "common/eq_stream_type.h"
#include "common/misc.h"
#include "common/mutex.h"
#include "common/opcodemgr.h"
#include "common/timer.h"
#include <deque>
#include <map> #include <map>
#include <queue> #include <queue>
#include <deque> #include <vector>
#ifndef WIN32 #ifndef WIN32
#include <netinet/in.h> #include <netinet/in.h>
#endif #endif
#include "../common/misc.h"
#include "../common/opcodemgr.h"
#include "../common/timer.h"
#include "eq_packet.h"
#include "eq_stream_intf.h"
#include "eq_stream_type.h"
#include "mutex.h"
class EQApplicationPacket; class EQApplicationPacket;
class EQProtocolPacket; class EQProtocolPacket;
@ -314,6 +312,3 @@ class EQStream : public EQStreamInterface {
virtual MatchState CheckSignature(const Signature *sig); virtual MatchState CheckSignature(const Signature *sig);
}; };
#endif

23
common/eq_stream_factory.cpp
View File

@ -1,19 +1,18 @@
#include "global_define.h"
#include "eqemu_logsys.h"
#include "eq_stream_factory.h" #include "eq_stream_factory.h"
#include "common/global_define.h"
#ifdef _WINDOWS #ifdef _WINDOWS
#include <winsock2.h> #include <winsock2.h>
#include <process.h> #include <process.h>
#include <io.h> #include <io.h>
#include <stdio.h> #include <stdio.h>
#else #else
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/select.h> #include <sys/select.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netdb.h> #include <netdb.h>
#include <pthread.h> #include <pthread.h>
#endif #endif
#include <iostream> #include <iostream>

14
common/eq_stream_factory.h
View File

@ -1,14 +1,12 @@
#ifndef _EQSTREAMFACTORY_H #pragma once
#define _EQSTREAMFACTORY_H #include "common/condition.h"
#include "common/eq_stream.h"
#include "common/timeoutmgr.h"
#include <map>
#include <memory> #include <memory>
#include <queue> #include <queue>
#include <map>
#include "../common/eq_stream.h"
#include "../common/condition.h"
#include "../common/timeoutmgr.h"
class EQStream; class EQStream;
class Timer; class Timer;
@ -57,5 +55,3 @@ class EQStreamFactory : private Timeoutable {
void StopWriter() { MWriterRunning.lock(); WriterRunning=false; MWriterRunning.unlock(); WriterWork.Signal(); } void StopWriter() { MWriterRunning.lock(); WriterRunning=false; MWriterRunning.unlock(); WriterWork.Signal(); }
void SignalWriter() { WriterWork.Signal(); } void SignalWriter() { WriterWork.Signal(); }
}; };
#endif

14
common/eq_stream_ident.cpp
View File

@ -1,10 +1,11 @@
#include <utility>
#include "global_define.h" #include "common/eq_stream_ident.h"
#include "eqemu_logsys.h" #include "common/eq_stream_proxy.h"
#include "eq_stream_ident.h" #include "common/eqemu_logsys.h"
#include "eq_stream_proxy.h" #include "common/global_define.h"
#include "misc.h" #include "common/misc.h"
#include <utility>
EQStreamIdentifier::~EQStreamIdentifier() { EQStreamIdentifier::~EQStreamIdentifier() {
while(!m_identified.empty()) { while(!m_identified.empty()) {
@ -162,4 +163,3 @@ EQStreamIdentifier::Record::Record(std::shared_ptr<EQStreamInterface> s)
expire(STREAM_IDENT_WAIT_MS) expire(STREAM_IDENT_WAIT_MS)
{ {
} }

14
common/eq_stream_ident.h
View File

@ -1,11 +1,11 @@
#ifndef EQSTREAMIDENT_H_ #pragma once
#define EQSTREAMIDENT_H_
#include "common/eq_stream_intf.h"
#include "common/timer.h"
#include "eq_stream_intf.h"
#include "timer.h"
#include <vector>
#include <queue>
#include <memory> #include <memory>
#include <queue>
#include <vector>
#define STREAM_IDENT_WAIT_MS 30000 #define STREAM_IDENT_WAIT_MS 30000
@ -47,5 +47,3 @@ protected:
std::vector<Record> m_streams; //we own these objects, and the streams contained in them. std::vector<Record> m_streams; //we own these objects, and the streams contained in them.
std::queue<EQStreamInterface *> m_identified; //we own these objects std::queue<EQStreamInterface *> m_identified; //we own these objects
}; };
#endif /*EQSTREAMIDENT_H_*/

15
common/eq_stream_intf.h
View File

@ -1,12 +1,13 @@
#ifndef EQSTREAMINTF_H_ #pragma once
#define EQSTREAMINTF_H_
#include "common/emu_versions.h"
#include "common/eq_packet.h"
#include "common/net/reliable_stream_connection.h"
#include <string>
//this is the only part of an EQStream that is seen by the application. //this is the only part of an EQStream that is seen by the application.
#include <string>
#include "emu_versions.h"
#include "eq_packet.h"
#include "net/reliable_stream_connection.h"
typedef enum { typedef enum {
ESTABLISHED, ESTABLISHED,
@ -106,5 +107,3 @@ public:
virtual void ResetStats() = 0; virtual void ResetStats() = 0;
virtual EQStreamManagerInterface* GetManager() const = 0; virtual EQStreamManagerInterface* GetManager() const = 0;
}; };
#endif /*EQSTREAMINTF_H_*/

14
common/eq_stream_locator.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 _EQSTREAM_LOCATOR_H
#define _EQSTREAM_LOCATOR_H #pragma once
#include "common/types.h"
#include <map>
#include <string>
/* /*
This did not turn out nearly as nice as I hoped. This did not turn out nearly as nice as I hoped.
*/ */
#include <map>
#include <string>
class EQStreamInfo { class EQStreamInfo {
public: public:
EQStreamInfo() {} EQStreamInfo() {}
@ -168,5 +170,3 @@ public:
protected: protected:
std::map<const EQStreamInfo, T *> streams; std::map<const EQStreamInfo, T *> streams;
}; };
#endif

9
common/eq_stream_proxy.cpp
View File

@ -1,9 +1,10 @@
#include "global_define.h"
#include "eq_stream_proxy.h" #include "eq_stream_proxy.h"
#include "struct_strategy.h"
#include "eqemu_logsys.h" #include "common/eqemu_logsys.h"
#include "opcodemgr.h" #include "common/global_define.h"
#include "common/opcodemgr.h"
#include "common/struct_strategy.h"
EQStreamProxy::EQStreamProxy(std::shared_ptr<EQStreamInterface> &stream, const StructStrategy *structs, OpcodeManager **opcodes) EQStreamProxy::EQStreamProxy(std::shared_ptr<EQStreamInterface> &stream, const StructStrategy *structs, OpcodeManager **opcodes)

10
common/eq_stream_proxy.h
View File

@ -1,9 +1,8 @@
#ifndef EQSTREAMPROXY_H_ #pragma once
#define EQSTREAMPROXY_H_
#include "common/eq_stream_intf.h"
#include "common/types.h"
#include "types.h"
#include "eq_stream_intf.h"
#include <memory> #include <memory>
class StructStrategy; class StructStrategy;
@ -44,6 +43,3 @@ protected:
OpcodeManager **const m_opcodes; OpcodeManager **const m_opcodes;
//we do not own this object. //we do not own this object.
}; };
#endif /*EQSTREAMPROXY_H_*/

5
common/eq_stream_type.h
View File

@ -1,5 +1,4 @@
#ifndef _EQSTREAMTYPE_H #pragma once
#define _EQSTREAMTYPE_H
typedef enum { typedef enum {
UnknownStream=0, UnknownStream=0,
@ -11,5 +10,3 @@ typedef enum {
MailStream MailStream
} EQStreamType; } EQStreamType;
#endif

9
common/eqdb.cpp
View File

@ -15,10 +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
*/ */
#include "global_define.h"
#include "eqdb.h" #include "eqdb.h"
#include "database.h"
#include <mysql.h> #include "common/database.h"
#include "common/global_define.h"
#include "mysql.h"
#include <cstring> #include <cstring>
EQDB EQDB::s_EQDB; EQDB EQDB::s_EQDB;

15
common/eqdb.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 EQDB_H_
#define EQDB_H_
#pragma once
#include "common/eqdb_res.h"
#include "common/types.h"
#include "mysql.h"
#include <map>
#include <string> #include <string>
#include <vector> #include <vector>
#include <map>
#include "types.h"
#include "eqdb_res.h"
#include <mysql.h>
//this is the main object exported to perl. //this is the main object exported to perl.
class EQDB { class EQDB {
@ -50,5 +51,3 @@ private:
static EQDB s_EQDB; static EQDB s_EQDB;
MYSQL *mysql_ref; MYSQL *mysql_ref;
}; };
#endif /*EQDB_H_*/

7
common/eqdb_res.cpp
View File

@ -15,9 +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 "global_define.h"
#include "eqdb_res.h" #include "eqdb_res.h"
#include <mysql.h>
#include "common/global_define.h"
#include "mysql.h"
std::vector<std::string> EQDBRes::fetch_row_array() { std::vector<std::string> EQDBRes::fetch_row_array() {
std::vector<std::string> array; std::vector<std::string> array;
@ -49,4 +51,3 @@ std::map<std::string,std::string> EQDBRes::fetch_row_hash() {
return rowhash; return rowhash;
} }

13
common/eqdb_res.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 EQDBRes_H_
#define EQDBRes_H_
#pragma once
#include "common/database.h"
#include "common/types.h"
#include "mysql.h"
#include <string> #include <string>
#include <vector> #include <vector>
#include <map> #include <map>
#include "types.h"
#include "database.h"
#include <mysql.h>
//this is the main object exported to perl. //this is the main object exported to perl.
class EQDBRes { class EQDBRes {
@ -44,5 +45,3 @@ public:
private: private:
MYSQL_RES *res; MYSQL_RES *res;
}; };
#endif /*EQDBRes_H_*/

13
common/eqemu_config.cpp
View File

@ -16,16 +16,17 @@
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 "eqemu_config.h" #include "eqemu_config.h"
#include "misc_functions.h"
#include "strings.h"
#include "eqemu_logsys.h"
#include "json/json.hpp"
#include "common/eqemu_logsys.h"
#include "common/global_define.h"
#include "common/json/json.hpp"
#include "common/misc_functions.h"
#include "common/strings.h"
#include <filesystem>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <filesystem>
std::string EQEmuConfig::ConfigFile = "eqemu_config.json"; std::string EQEmuConfig::ConfigFile = "eqemu_config.json";
EQEmuConfig *EQEmuConfig::_config = nullptr; EQEmuConfig *EQEmuConfig::_config = nullptr;

16
common/eqemu_config.h
View File

@ -15,15 +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
*/ */
#ifndef __EQEmuConfig_H
#define __EQEmuConfig_H
#include "json/json.h" #pragma once
#include "linked_list.h"
#include "path_manager.h" #include "common/json/json.h"
#include "common/linked_list.h"
#include "common/path_manager.h"
#include "fmt/format.h"
#include <fstream> #include <fstream>
#include <fmt/format.h>
#include <fmt/ranges.h>
struct LoginConfig { struct LoginConfig {
std::string LoginHost; std::string LoginHost;
@ -211,5 +211,3 @@ class EQEmuConfig
void Dump() const; void Dump() const;
void CheckUcsConfigConversion(); void CheckUcsConfigConversion();
}; };
#endif

5
common/eqemu_exception.h
View File

@ -16,8 +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
*/ */
#ifndef _EQEMU_EQEMUEXCEPTION_H #pragma once
#define _EQEMU_EQEMUEXCEPTION_H
#include <sstream> #include <sstream>
#include <exception> #include <exception>
@ -106,5 +105,3 @@ namespace EQ
#ifndef EQ_EXCEPT #ifndef EQ_EXCEPT
#define EQ_EXCEPT(n, d) throw EQ::Exception(n, d, __FILE__, __LINE__) #define EQ_EXCEPT(n, d) throw EQ::Exception(n, d, __FILE__, __LINE__)
#endif #endif
#endif

38
common/eqemu_logsys.cpp
View File

@ -19,39 +19,37 @@
*/ */
#include "eqemu_logsys.h" #include "eqemu_logsys.h"
#include "rulesys.h"
#include "platform.h"
#include "strings.h"
#include "repositories/discord_webhooks_repository.h"
#include "repositories/logsys_categories_repository.h"
#include "termcolor/rang.hpp"
#include "path_manager.h"
#include "file.h"
#include <iostream> #include "common/file.h"
#include <string> #include "common/path_manager.h"
#include <time.h> #include "common/platform.h"
#include <sys/stat.h> #include "common/repositories/discord_webhooks_repository.h"
#include "common/repositories/logsys_categories_repository.h"
std::ofstream process_log; #include "common/rulesys.h"
#include "common/strings.h"
#include "common/termcolor/rang.hpp"
#include <filesystem> #include <filesystem>
#include <iostream>
#include <string>
#include <sys/stat.h>
#include <time.h>
#ifdef _WINDOWS #ifdef _WINDOWS
#include <direct.h>
#include <conio.h> #include <conio.h>
#include <iostream> #include <direct.h>
#include <dos.h> #include <dos.h>
#include <windows.h> #include <iostream>
#include <process.h> #include <process.h>
#include <windows.h>
#else #else
#include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <thread> #include <thread>
#include <unistd.h>
#endif #endif
std::ofstream process_log;
/** /**
* EQEmuLogSys Constructor * EQEmuLogSys Constructor
*/ */

20
common/eqemu_logsys.h
View File

@ -18,14 +18,16 @@
* *
*/ */
#ifndef EQEMU_LOGSYS_H #pragma once
#define EQEMU_LOGSYS_H
#include <iostream> #include "common/types.h"
#include <fstream>
#include <cstdio> #include "fmt/format.h"
#include <functional>
#include <algorithm> #include <algorithm>
#include <cstdio>
#include <fstream>
#include <functional>
#include <iostream>
#ifdef _WIN32 #ifdef _WIN32
#ifdef utf16_to_utf8 #ifdef utf16_to_utf8
@ -33,10 +35,6 @@
#endif #endif
#endif #endif
#include <fmt/format.h>
#include <fmt/ranges.h>
#include "types.h"
namespace Logs { namespace Logs {
enum DebugLevel { enum DebugLevel {
General = 1, // 1 - Low-Level general debugging, useful info on single line General = 1, // 1 - Low-Level general debugging, useful info on single line
@ -463,5 +461,3 @@ void OutF(
do { \ do { \
ls->Out(debug_level, log_category, file, func, line, fmt::format(formatStr, ##__VA_ARGS__).c_str()); \ ls->Out(debug_level, log_category, file, func, line, fmt::format(formatStr, ##__VA_ARGS__).c_str()); \
} while(0) } while(0)
#endif

8
common/eqemu_logsys_log_aliases.h
View File

@ -18,8 +18,9 @@
* *
*/ */
#ifndef EQEMU_EQEMU_LOGSYS_LOG_ALIASES_H #pragma once
#define EQEMU_EQEMU_LOGSYS_LOG_ALIASES_H
#include "common/eqemu_logsys.h"
inline auto logsys = EQEmuLogSys::Instance(); inline auto logsys = EQEmuLogSys::Instance();
@ -935,6 +936,3 @@ inline auto logsys = EQEmuLogSys::Instance();
if (logsys->IsLogEnabled(debug_level, log_category))\ if (logsys->IsLogEnabled(debug_level, log_category))\
OutF(logsys, debug_level, log_category, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\ OutF(logsys, debug_level, log_category, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
} while (0) } while (0)
#endif //EQEMU_EQEMU_LOGSYS_LOG_ALIASES_H

13
common/eqtime.cpp
View File

@ -16,13 +16,16 @@
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 "eqtime.h"
#include "common/eq_packet_structs.h"
#include "common/eqemu_logsys.h"
#include "common/global_define.h"
#include <fstream> #include <fstream>
#include "../common/global_define.h"
#include "../common/eqemu_logsys.h"
#include "../common/eqtime.h"
#include "../common/eq_packet_structs.h"
#include <memory.h>
#include <iostream> #include <iostream>
#include <memory.h>
/*#ifdef _CRTDBG_MAP_ALLOC /*#ifdef _CRTDBG_MAP_ALLOC
#undef new #undef new
#endif*/ #endif*/

8
common/eqtime.h
View File

@ -1,7 +1,7 @@
#ifndef EQTIME_H #pragma once
#define EQTIME_H
#include "common/eq_packet_structs.h"
#include "../common/eq_packet_structs.h"
#include <string> #include <string>
//Struct //Struct
@ -48,5 +48,3 @@ private:
//This is our tz offset //This is our tz offset
int32 timezone; int32 timezone;
}; };
#endif

5
common/event/event_loop.h
View File

@ -1,7 +1,8 @@
#pragma once #pragma once
#include "uv.h"
#include <functional> #include <functional>
#include <uv.h>
#include <cstring>
namespace EQ namespace EQ
{ {

8
common/event/task.h
View File

@ -1,9 +1,11 @@
#pragma once #pragma once
#include <any>
#include <functional>
#include <exception>
#include "event_loop.h" #include "event_loop.h"
#include <any>
#include <exception>
#include <functional>
namespace EQ { namespace EQ {
class Task class Task
{ {

9
common/event/task_scheduler.h
View File

@ -1,11 +1,12 @@
#pragma once #pragma once
#include <vector>
#include <thread>
#include <mutex>
#include <condition_variable> #include <condition_variable>
#include <functional> #include <functional>
#include <queue>
#include <future> #include <future>
#include <mutex>
#include <queue>
#include <thread>
#include <vector>
namespace EQ namespace EQ
{ {

4
common/event/timer.h
View File

@ -1,7 +1,9 @@
#pragma once #pragma once
#include <functional>
#include "event_loop.h" #include "event_loop.h"
#include <functional>
namespace EQ { namespace EQ {
class Timer class Timer
{ {

2
common/event_sub.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <unordered_map>
#include <string> #include <string>
#include <unordered_map>
class EventSubscriptionWatcher class EventSubscriptionWatcher
{ {

15
common/events/player_event_discord_formatter.cpp
View File

@ -1,11 +1,14 @@
#include "player_event_discord_formatter.h" #include "player_event_discord_formatter.h"
#include "../repositories/character_data_repository.h"
#include "../json/json_archive_single_line.h" #include "common/json/json_archive_single_line.h"
#include "common/repositories/character_data_repository.h"
#include "cereal/archives/json.hpp"
#include "cereal/types/vector.hpp"
#include "fmt/format.h"
#include "fmt/ranges.h"
#include <vector> #include <vector>
#include <fmt/format.h>
#include <fmt/ranges.h>
#include <cereal/archives/json.hpp>
#include <cereal/types/vector.hpp>
std::string PlayerEventDiscordFormatter::GetCurrentTimestamp() std::string PlayerEventDiscordFormatter::GetCurrentTimestamp()
{ {

16
common/events/player_event_discord_formatter.h
View File

@ -1,11 +1,12 @@
#ifndef EQEMU_PLAYER_EVENT_DISCORD_FORMATTER_H #pragma once
#define EQEMU_PLAYER_EVENT_DISCORD_FORMATTER_H
#include "common/events/player_events.h"
#include "common/repositories/base/base_player_event_logs_repository.h"
#include "cereal/archives/json.hpp"
#include "cereal/types/vector.hpp"
#include <string> #include <string>
#include "player_events.h"
#include "../repositories/base/base_player_event_logs_repository.h"
#include <cereal/archives/json.hpp>
#include <cereal/types/vector.hpp>
struct DiscordField { struct DiscordField {
std::string name; std::string name;
@ -209,6 +210,3 @@ public:
std::vector<DiscordEmbed> &embeds std::vector<DiscordEmbed> &embeds
); );
}; };
#endif //EQEMU_PLAYER_EVENT_DISCORD_FORMATTER_H

20
common/events/player_event_logs.cpp
View File

@ -1,14 +1,16 @@
#include "player_event_logs.h" #include "player_event_logs.h"
#include <cereal/archives/json.hpp>
#include "../platform.h" #include "common/events/player_event_discord_formatter.h"
#include "../rulesys.h" #include "common/platform.h"
#include "player_event_discord_formatter.h" #include "common/repositories/player_event_loot_items_repository.h"
#include "../repositories/player_event_loot_items_repository.h" #include "common/repositories/player_event_merchant_purchase_repository.h"
#include "../repositories/player_event_merchant_sell_repository.h" #include "common/repositories/player_event_merchant_sell_repository.h"
#include "../repositories/player_event_merchant_purchase_repository.h" #include "common/repositories/player_event_npc_handin_entries_repository.h"
#include "../repositories/player_event_npc_handin_repository.h" #include "common/repositories/player_event_npc_handin_repository.h"
#include "../repositories/player_event_npc_handin_entries_repository.h" #include "common/rulesys.h"
#include "cereal/archives/json.hpp"
#include "fmt/ranges.h"
const uint32 PROCESS_RETENTION_TRUNCATION_TIMER_INTERVAL = 60 * 60 * 1000; // 1 hour const uint32 PROCESS_RETENTION_TRUNCATION_TIMER_INTERVAL = 60 * 60 * 1000; // 1 hour

46
common/events/player_event_logs.h
View File

@ -1,28 +1,26 @@
#ifndef EQEMU_PLAYER_EVENT_LOGS_H #pragma once
#define EQEMU_PLAYER_EVENT_LOGS_H
#include <cereal/archives/json.hpp> #include "common/eqemu_config.h"
#include "common/json/json_archive_single_line.h"
#include "common/repositories/player_event_aa_purchase_repository.h"
#include "common/repositories/player_event_killed_named_npc_repository.h"
#include "common/repositories/player_event_killed_npc_repository.h"
#include "common/repositories/player_event_killed_raid_npc_repository.h"
#include "common/repositories/player_event_log_settings_repository.h"
#include "common/repositories/player_event_logs_repository.h"
#include "common/repositories/player_event_loot_items_repository.h"
#include "common/repositories/player_event_merchant_purchase_repository.h"
#include "common/repositories/player_event_merchant_sell_repository.h"
#include "common/repositories/player_event_npc_handin_entries_repository.h"
#include "common/repositories/player_event_npc_handin_repository.h"
#include "common/repositories/player_event_speech_repository.h"
#include "common/repositories/player_event_trade_entries_repository.h"
#include "common/repositories/player_event_trade_repository.h"
#include "common/servertalk.h"
#include "common/timer.h"
#include "cereal/archives/json.hpp"
#include <mutex> #include <mutex>
#include "../json/json_archive_single_line.h"
#include "../servertalk.h"
#include "../timer.h"
#include "../eqemu_config.h"
#include "../repositories/player_event_log_settings_repository.h"
#include "../repositories/player_event_logs_repository.h"
#include "../repositories/player_event_loot_items_repository.h"
#include "../repositories/player_event_merchant_purchase_repository.h"
#include "../repositories/player_event_merchant_sell_repository.h"
#include "../repositories/player_event_npc_handin_repository.h"
#include "../repositories/player_event_npc_handin_entries_repository.h"
#include "../repositories/player_event_trade_repository.h"
#include "../repositories/player_event_trade_entries_repository.h"
#include "../repositories/player_event_speech_repository.h"
#include "../repositories/player_event_killed_npc_repository.h"
#include "../repositories/player_event_killed_named_npc_repository.h"
#include "../repositories/player_event_killed_raid_npc_repository.h"
#include "../repositories/player_event_aa_purchase_repository.h"
class PlayerEventLogs { class PlayerEventLogs {
@ -134,5 +132,3 @@ private:
public: public:
std::map<PlayerEvent::EventType, EtlSettings> &GetEtlSettings() { return m_etl_settings;} std::map<PlayerEvent::EventType, EtlSettings> &GetEtlSettings() { return m_etl_settings;}
}; };
#endif //EQEMU_PLAYER_EVENT_LOGS_H

15
common/events/player_events.h
View File

@ -1,11 +1,12 @@
#ifndef EQEMU_PLAYER_EVENTS_H #pragma once
#define EQEMU_PLAYER_EVENTS_H
#include "common/repositories/player_event_logs_repository.h"
#include "common/rulesys.h"
#include "common/types.h"
#include "cereal/cereal.hpp"
#include <string> #include <string>
#include <cereal/cereal.hpp>
#include "../types.h"
#include "../rulesys.h"
#include "../repositories/player_event_logs_repository.h"
#define CEREAL_NVP_IF_NONZERO(ar, name) \ #define CEREAL_NVP_IF_NONZERO(ar, name) \
if ((name) != 0) ar(cereal::make_nvp(#name, name)) if ((name) != 0) ar(cereal::make_nvp(#name, name))
@ -1753,8 +1754,6 @@ namespace PlayerEvent {
}; };
} }
#endif //EQEMU_PLAYER_EVENTS_H
#define RecordPlayerEventLog(event_type, event_data) do {\ #define RecordPlayerEventLog(event_type, event_data) do {\
if (PlayerEventLogs::Instance()->IsEventEnabled(event_type)) {\ if (PlayerEventLogs::Instance()->IsEventEnabled(event_type)) {\
if (RuleB(Logging, PlayerEventsQSProcess)) {\ if (RuleB(Logging, PlayerEventsQSProcess)) {\

7
common/evolving_items.cpp
View File

@ -1,7 +1,8 @@
#include "evolving_items.h" #include "evolving_items.h"
#include "item_instance.h"
#include "events/player_event_logs.h" #include "common/events/player_event_logs.h"
#include "repositories/character_evolving_items_repository.h" #include "common/item_instance.h"
#include "common/repositories/character_evolving_items_repository.h"
EvolvingItemsManager::EvolvingItemsManager() EvolvingItemsManager::EvolvingItemsManager()
{ {

11
common/evolving_items.h
View File

@ -1,9 +1,8 @@
#ifndef EVOLVING_H #pragma once
#define EVOLVING_H
#include "shareddb.h" #include "common/events/player_events.h"
#include "events/player_events.h" #include "common/repositories/items_evolving_details_repository.h"
#include "repositories/items_evolving_details_repository.h" #include "common/shareddb.h"
namespace EQ { namespace EQ {
class ItemInstance; class ItemInstance;
@ -66,5 +65,3 @@ private:
Database * m_db; Database * m_db;
Database * m_content_db; Database * m_content_db;
}; };
#endif //EVOLVING_H

4
common/extprofile.cpp
View File

@ -16,9 +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 "global_define.h"
#include "extprofile.h" #include "extprofile.h"
#include "common/global_define.h"
//Set defaults in the extended profile... //Set defaults in the extended profile...
void InitExtendedProfile(ExtendedProfile_Struct *p) { void InitExtendedProfile(ExtendedProfile_Struct *p) {
memset(p, 0, sizeof(ExtendedProfile_Struct)); memset(p, 0, sizeof(ExtendedProfile_Struct));
@ -49,4 +50,3 @@ bool SetExtendedProfile(ExtendedProfile_Struct *to, char *old, unsigned int len)
return(false); return(false);
} }

14
common/extprofile.h
View File

@ -15,12 +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 EXTENDED_PROFILE_H
#define EXTENDED_PROFILE_H
#include "eq_packet_structs.h" #pragma once
#include "inventory_profile.h"
#include "common/eq_packet_structs.h"
#include "common/inventory_profile.h"
#pragma pack(push)
#pragma pack(1) #pragma pack(1)
/* /*
@ -58,10 +59,7 @@ struct ExtendedProfile_Struct {
uint32 next_invsnapshot_time; /* Used */ uint32 next_invsnapshot_time; /* Used */
}; };
#pragma pack() #pragma pack(pop)
void InitExtendedProfile(ExtendedProfile_Struct *p); void InitExtendedProfile(ExtendedProfile_Struct *p);
bool SetExtendedProfile(ExtendedProfile_Struct *to, char *old, unsigned int len); bool SetExtendedProfile(ExtendedProfile_Struct *to, char *old, unsigned int len);
#endif

6
common/faction.cpp
View File

@ -17,8 +17,9 @@
*/ */
#include "faction.h" #include "faction.h"
#include "races.h"
#include "rulesys.h" #include "common/races.h"
#include "common/rulesys.h"
const char *FactionValueToString(FACTION_VALUE faction_value) const char *FactionValueToString(FACTION_VALUE faction_value)
{ {
@ -163,4 +164,3 @@ bool IsOfIndiffRace(int r1, int r2)
} }
return false; return false;
} }

10
common/faction.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 _EQEMU_FACTION_H
#define _EQEMU_FACTION_H
#include "types.h" #pragma once
#include "features.h"
#include "common/features.h"
#include "common/types.h"
#include <map> #include <map>
#include <string> #include <string>
@ -75,4 +76,3 @@ struct NPCFaction
const char *FactionValueToString(FACTION_VALUE faction_value); const char *FactionValueToString(FACTION_VALUE faction_value);
FACTION_VALUE CalculateFaction(FactionMods* fm, int32 tmpCharacter_value); FACTION_VALUE CalculateFaction(FactionMods* fm, int32 tmpCharacter_value);
#endif

9
common/features.h
View File

@ -15,8 +15,8 @@
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 FEATURES_H
#define FEATURES_H #pragma once
/* /*
@ -257,8 +257,3 @@ Developer configuration
#define PROFILE_DUMP_TIME 180 #define PROFILE_DUMP_TIME 180
#endif //EQPROFILE #endif //EQPROFILE
#endif

Some files were not shown because too many files have changed in this diff Show More