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

FMT test

Browse Source
This commit is contained in:
Akkadius 2023-12-16 18:54:25 -06:00
parent e9ca2b4202
commit 75d9e6ffaf
36 changed files with 54 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/classes.cpp
View File

@ -15,7 +15,7 @@
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/core.h>
#include "../common/global_define.h" #include "../common/global_define.h"
#include "../common/classes.h" #include "../common/classes.h"
#include "data_verification.h" #include "data_verification.h"

2
common/cli/eqemu_command_handler.cpp
View File

@ -18,7 +18,7 @@
* *
*/ */
#include <fmt/format.h> #include <fmt/core.h>
#include "eqemu_command_handler.h" #include "eqemu_command_handler.h"
#include "terminal_color.hpp" #include "terminal_color.hpp"
#include "../platform.h" #include "../platform.h"

2
common/eqemu_config.h
View File

@ -22,7 +22,7 @@
#include "linked_list.h" #include "linked_list.h"
#include "path_manager.h" #include "path_manager.h"
#include <fstream> #include <fstream>
#include <fmt/format.h> #include <fmt/core.h>
struct LoginConfig { struct LoginConfig {
std::string LoginHost; std::string LoginHost;

3
common/eqemu_logsys.h
View File

@ -33,7 +33,8 @@
#endif #endif
#endif #endif
#include <fmt/format.h> //#define FMT_HEADER_ONLY
#include <fmt/core.h>
#include "types.h" #include "types.h"
namespace Logs { namespace Logs {

2
common/events/player_event_discord_formatter.cpp
View File

@ -2,7 +2,7 @@
#include "../repositories/character_data_repository.h" #include "../repositories/character_data_repository.h"
#include "../json/json_archive_single_line.h" #include "../json/json_archive_single_line.h"
#include <vector> #include <vector>
#include <fmt/format.h> #include <fmt/core.h>
#include <cereal/archives/json.hpp> #include <cereal/archives/json.hpp>
#include <cereal/types/vector.hpp> #include <cereal/types/vector.hpp>

1
common/expedition_lockout_timer.cpp
View File

@ -22,6 +22,7 @@
#include "../common/strings.h" #include "../common/strings.h"
#include "../common/rulesys.h" #include "../common/rulesys.h"
#include "../common/util/uuid.h" #include "../common/util/uuid.h"
#include <fmt/core.h>
#include <fmt/format.h> #include <fmt/format.h>
const char* const DZ_REPLAY_TIMER_NAME = "Replay Timer"; // see December 14, 2016 patch notes const char* const DZ_REPLAY_TIMER_NAME = "Replay Timer"; // see December 14, 2016 patch notes

2
common/file.cpp
View File

@ -35,7 +35,7 @@
#endif #endif
#include <fmt/format.h> #include <fmt/core.h>
#include <filesystem> #include <filesystem>
#include <iostream> #include <iostream>

2
common/ip_util.cpp
View File

@ -19,7 +19,7 @@
*/ */
#include <cstring> #include <cstring>
#include <fmt/format.h> #include <fmt/core.h>
#include <csignal> #include <csignal>
#include <vector> #include <vector>
#include "ip_util.h" #include "ip_util.h"

2
common/net/console_server.cpp
View File

@ -1,6 +1,6 @@
#include "console_server.h" #include "console_server.h"
#include "../strings.h" #include "../strings.h"
#include <fmt/format.h> #include <fmt/core.h>
EQ::Net::ConsoleServer::ConsoleServer(const std::string &addr, int port) EQ::Net::ConsoleServer::ConsoleServer(const std::string &addr, int port)
{ {

2
common/net/console_server_connection.cpp
View File

@ -4,7 +4,7 @@
#include "../eqemu_logsys.h" #include "../eqemu_logsys.h"
#include "../servertalk.h" #include "../servertalk.h"
#include "../rulesys.h" #include "../rulesys.h"
#include <fmt/format.h> #include <fmt/core.h>
EQ::Net::ConsoleServerConnection::ConsoleServerConnection(ConsoleServer *parent, std::shared_ptr<TCPConnection> connection) EQ::Net::ConsoleServerConnection::ConsoleServerConnection(ConsoleServer *parent, std::shared_ptr<TCPConnection> connection)
{ {

2
common/net/daybreak_connection.cpp
View File

@ -5,7 +5,7 @@
#include "crc32.h" #include "crc32.h"
#include "../eqemu_logsys.h" #include "../eqemu_logsys.h"
#include <zlib.h> #include <zlib.h>
#include <fmt/format.h> #include <fmt/core.h>
#include <sstream> #include <sstream>
EQ::Net::DaybreakConnectionManager::DaybreakConnectionManager() EQ::Net::DaybreakConnectionManager::DaybreakConnectionManager()

2
common/net/packet.cpp
View File

@ -1,7 +1,7 @@
#include "packet.h" #include "packet.h"
#include "endian.h" #include "endian.h"
#include <cctype> #include <cctype>
#include <fmt/format.h> #include <fmt/core.h>
void EQ::Net::Packet::PutInt8(size_t offset, int8_t value) void EQ::Net::Packet::PutInt8(size_t offset, int8_t value)
{ {

2
common/net/websocket_server.cpp
View File

@ -1,7 +1,7 @@
#include "websocket_server.h" #include "websocket_server.h"
#include "../event/event_loop.h" #include "../event/event_loop.h"
#include "../event/timer.h" #include "../event/timer.h"
#include <fmt/format.h> #include <fmt/core.h>
#include <map> #include <map>
#include <unordered_set> #include <unordered_set>
#include <array> #include <array>

2
common/net/websocket_server_connection.cpp
View File

@ -3,7 +3,7 @@
#include "../timer.h" #include "../timer.h"
#include "../util/uuid.h" #include "../util/uuid.h"
#include <sstream> #include <sstream>
#include <fmt/format.h> #include <fmt/core.h>
struct EQ::Net::WebsocketServerConnection::Impl { struct EQ::Net::WebsocketServerConnection::Impl {
WebsocketServer *parent; WebsocketServer *parent;

2
common/pch/pch.h
View File

@ -27,7 +27,7 @@
// fmt // fmt
#include <fmt/format.h> #include <fmt/core.h>
//# include <fmt/core.h> //# include <fmt/core.h>
//# define FMT_STRING(s) s //# define FMT_STRING(s) s

2
common/profanity_manager.h
View File

@ -22,7 +22,7 @@
#include <string> #include <string>
#include <list> #include <list>
#include <fmt/format.h> #include <fmt/core.h>
class DBcore; class DBcore;

2
common/rulesys.cpp
View File

@ -22,7 +22,7 @@
#include "strings.h" #include "strings.h"
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#include <fmt/format.h> #include <fmt/core.h>
#include "../common/repositories/rule_sets_repository.h" #include "../common/repositories/rule_sets_repository.h"
#include "../common/repositories/rule_values_repository.h" #include "../common/repositories/rule_values_repository.h"

2
common/shareddb.cpp
View File

@ -18,7 +18,7 @@
#include <iostream> #include <iostream>
#include <cstring> #include <cstring>
#include <fmt/format.h> #include <fmt/core.h>
#if defined(_MSC_VER) && _MSC_VER >= 1800 #if defined(_MSC_VER) && _MSC_VER >= 1800
#include <algorithm> #include <algorithm>

2
common/strings.cpp
View File

@ -34,7 +34,7 @@
*/ */
#include "strings.h" #include "strings.h"
#include <fmt/format.h> #include <fmt/core.h>
#include <algorithm> #include <algorithm>
#include <cctype> #include <cctype>

6
common/strings.h
View File

@ -44,7 +44,7 @@
#include <tuple> #include <tuple>
#include <type_traits> #include <type_traits>
#include <fmt/format.h> #include <fmt/core.h>
#ifndef _WIN32 #ifndef _WIN32
// this doesn't appear to affect linux-based systems..need feedback for _WIN64 // this doesn't appear to affect linux-based systems..need feedback for _WIN64
@ -206,7 +206,7 @@ const std::string NUM_TO_ENGLISH_Y[] = {
"Fifty ", "Sixty ", "Seventy ", "Eighty ", "Ninety " "Fifty ", "Sixty ", "Seventy ", "Eighty ", "Ninety "
}; };
// _WIN32 builds require that #include<fmt/format.h> be included in whatever code file the invocation is made from (no header files) // _WIN32 builds require that #include<fmt/core.h> be included in whatever code file the invocation is made from (no header files)
template<typename T1, typename T2> template<typename T1, typename T2>
std::vector<std::string> join_pair( std::vector<std::string> join_pair(
const std::string &glue, const std::string &glue,
@ -239,7 +239,7 @@ std::vector<std::string> join_pair(
return output; return output;
} }
// _WIN32 builds require that #include<fmt/format.h> be included in whatever code file the invocation is made from (no header files) // _WIN32 builds require that #include<fmt/core.h> be included in whatever code file the invocation is made from (no header files)
template<typename T1, typename T2, typename T3, typename T4> template<typename T1, typename T2, typename T3, typename T4>
std::vector<std::string> join_tuple( std::vector<std::string> join_tuple(
const std::string &glue, const std::string &glue,

2
common/strings_legacy.cpp
View File

@ -1,6 +1,6 @@
#include <cstring> #include <cstring>
#include "strings.h" #include "strings.h"
#include <fmt/format.h> #include <fmt/core.h>
#include <algorithm> #include <algorithm>
#include <cctype> #include <cctype>
#include <cinttypes> #include <cinttypes>

2
common/strings_misc.cpp
View File

@ -1,6 +1,6 @@
#include <cstring> #include <cstring>
#include "strings.h" #include "strings.h"
#include <fmt/format.h> #include <fmt/core.h>
#include <algorithm> #include <algorithm>
#include <cctype> #include <cctype>

2
common/util/uuid.cpp
View File

@ -1,7 +1,7 @@
#include "uuid.h" #include "uuid.h"
#include <ios> #include <ios>
#include <fmt/format.h> #include <fmt/core.h>
#ifdef _WIN32 #ifdef _WIN32
#include <objbase.h> #include <objbase.h>

1
world/clientlist.cpp
View File

@ -35,6 +35,7 @@
#include "wguild_mgr.h" #include "wguild_mgr.h"
#include "../common/zone_store.h" #include "../common/zone_store.h"
#include <set> #include <set>
#include <fmt/format.h>
extern WebInterfaceList web_interface; extern WebInterfaceList web_interface;

2
world/console.cpp
View File

@ -31,7 +31,7 @@
#include "../common/md5.h" #include "../common/md5.h"
#include "eqemu_api_world_data_service.h" #include "eqemu_api_world_data_service.h"
#include "../common/zone_store.h" #include "../common/zone_store.h"
#include <fmt/format.h> #include <fmt/core.h>
extern ClientList client_list; extern ClientList client_list;
extern ZSList zoneserver_list; extern ZSList zoneserver_list;

2
world/eqemu_api_world_data_service.cpp
View File

@ -18,7 +18,7 @@
* *
*/ */
#include <fmt/format.h> #include <fmt/core.h>
#include "clientlist.h" #include "clientlist.h"
#include "cliententry.h" #include "cliententry.h"
#include "eqemu_api_world_data_service.h" #include "eqemu_api_world_data_service.h"

1
world/expedition_database.cpp
View File

@ -23,6 +23,7 @@
#include "../common/repositories/expeditions_repository.h" #include "../common/repositories/expeditions_repository.h"
#include "../common/repositories/expedition_lockouts_repository.h" #include "../common/repositories/expedition_lockouts_repository.h"
#include "../common/repositories/dynamic_zone_members_repository.h" #include "../common/repositories/dynamic_zone_members_repository.h"
#include <fmt/format.h>
void ExpeditionDatabase::PurgeExpiredExpeditions() void ExpeditionDatabase::PurgeExpiredExpeditions()
{ {

1
world/shared_task_manager.cpp
View File

@ -16,6 +16,7 @@
#include "../common/repositories/completed_shared_task_activity_state_repository.h" #include "../common/repositories/completed_shared_task_activity_state_repository.h"
#include "../common/repositories/shared_task_dynamic_zones_repository.h" #include "../common/repositories/shared_task_dynamic_zones_repository.h"
#include <ctime> #include <ctime>
#include <fmt/format.h>
extern ClientList client_list; extern ClientList client_list;
extern ZSList zoneserver_list; extern ZSList zoneserver_list;

1
world/zonelist.cpp
View File

@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "../common/event_sub.h" #include "../common/event_sub.h"
#include "web_interface.h" #include "web_interface.h"
#include "../common/zone_store.h" #include "../common/zone_store.h"
#include <fmt/format.h>
extern uint32 numzones; extern uint32 numzones;
extern EQ::Random emu_random; extern EQ::Random emu_random;

2
zone/bot_command.cpp
View File

@ -65,7 +65,7 @@
#include "dialogue_window.h" #include "dialogue_window.h"
#include "mob.h" #include "mob.h"
#include <fmt/format.h> #include <fmt/core.h>
extern QueryServ* QServ; extern QueryServ* QServ;
extern WorldServer worldserver; extern WorldServer worldserver;

2
zone/bot_database.cpp
View File

@ -29,7 +29,7 @@
#include "bot.h" #include "bot.h"
#include "client.h" #include "client.h"
#include <fmt/format.h> #include <fmt/core.h>
bool BotDatabase::LoadBotCommandSettings(std::map<std::string, std::pair<uint8, std::vector<std::string>>> &bot_command_settings) bool BotDatabase::LoadBotCommandSettings(std::map<std::string, std::pair<uint8, std::vector<std::string>>> &bot_command_settings)

2
zone/command.cpp
View File

@ -1,7 +1,7 @@
#include <string.h> #include <string.h>
#include <algorithm> #include <algorithm>
#include <thread> #include <thread>
#include <fmt/format.h> #include <fmt/core.h>
#include "../common/repositories/command_subsettings_repository.h" #include "../common/repositories/command_subsettings_repository.h"
#ifdef _WINDOWS #ifdef _WINDOWS

2
zone/pathfinder_interface.cpp
View File

@ -2,7 +2,7 @@
#include "client.h" #include "client.h"
#include "pathfinder_null.h" #include "pathfinder_null.h"
#include "pathfinder_nav_mesh.h" #include "pathfinder_nav_mesh.h"
#include <fmt/format.h> #include <fmt/core.h>
#include <sys/stat.h> #include <sys/stat.h>
IPathfinder *IPathfinder::Load(const std::string &zone) { IPathfinder *IPathfinder::Load(const std::string &zone) {

2
zone/pch.h
View File

@ -27,7 +27,7 @@
// fmt // fmt
//#include <fmt/format.h> //#include <fmt/core.h>
//# include <fmt/core.h> //# include <fmt/core.h>
//# define FMT_STRING(s) s //# define FMT_STRING(s) s

2
zone/spawngroup.cpp
View File

@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <fmt/format.h> #include <fmt/core.h>
#include "../common/global_define.h" #include "../common/global_define.h"
#include "../common/types.h" #include "../common/types.h"

2
zone/zonedb.cpp
View File

@ -25,7 +25,7 @@
#include <ctime> #include <ctime>
#include <iostream> #include <iostream>
#include <fmt/format.h> #include <fmt/core.h>
extern Zone* zone; extern Zone* zone;