pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-11 07:38:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[C++20] Enable C++20 + Fixes + FMT 9.1 (#2664)

Browse Source 
* [CPP] Enable and build compliance with cpp20

* Windows build fix

* bump fmt version

* Updated fmt to 9.1, updated cmake minimum and verified preprocessor stuff works.

* Missing :

* Fix warning: top-level comma expression in array subscript is deprecated

* Fix warning: top-level comma expression in array subscript is deprecated

Co-authored-by: KimLS <KimLS@peqtgc.com>
This commit is contained in:
Chris Miles
2022-12-20 21:52:36 -06:00
committed by GitHub
parent db12c069ef
commit c236c57a2c
41 changed files with 145 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/lua_general.cpp
+32 -32
View File
@@ -3836,7 +3836,7 @@ bool get_ruleb(int rule) {
luabind::scope lua_register_general() {
return luabind::namespace_("eq")
[
[(
luabind::def("load_encounter", &load_encounter),
luabind::def("unload_encounter", &unload_encounter),
luabind::def("load_encounter_with_data", &load_encounter_with_data),
@@ -4449,25 +4449,25 @@ luabind::scope lua_register_general() {
luabind::def("remove_expedition_lockout_by_char_id", &lua_remove_expedition_lockout_by_char_id),
luabind::def("remove_all_expedition_lockouts_by_char_id", (void(*)(uint32))&lua_remove_all_expedition_lockouts_by_char_id),
luabind::def("remove_all_expedition_lockouts_by_char_id", (void(*)(uint32, std::string))&lua_remove_all_expedition_lockouts_by_char_id)
];
)];
}
luabind::scope lua_register_random() {
return luabind::namespace_("Random")
[
[(
luabind::def("Int", &random_int),
luabind::def("Real", &random_real),
luabind::def("Roll", &random_roll_int),
luabind::def("RollReal", &random_roll_real),
luabind::def("Roll0", &random_roll0)
];
)];
}
luabind::scope lua_register_events() {
return luabind::class_<Events>("Event")
.enum_("constants")
[
[(
luabind::value("say", static_cast<int>(EVENT_SAY)),
luabind::value("trade", static_cast<int>(EVENT_TRADE)),
luabind::value("death", static_cast<int>(EVENT_DEATH)),
@@ -4566,13 +4566,13 @@ luabind::scope lua_register_events() {
luabind::value("payload", static_cast<int>(EVENT_PAYLOAD)),
luabind::value("level_down", static_cast<int>(EVENT_LEVEL_DOWN)),
luabind::value("gm_command", static_cast<int>(EVENT_GM_COMMAND))
];
)];
}
luabind::scope lua_register_faction() {
return luabind::class_<Factions>("Faction")
.enum_("constants")
[
[(
luabind::value("Ally", static_cast<int>(FACTION_ALLY)),
luabind::value("Warmly", static_cast<int>(FACTION_WARMLY)),
luabind::value("Kindly", static_cast<int>(FACTION_KINDLY)),
@@ -4582,13 +4582,13 @@ luabind::scope lua_register_faction() {
luabind::value("Dubious", static_cast<int>(FACTION_DUBIOUSLY)),
luabind::value("Threatenly", static_cast<int>(FACTION_THREATENINGLY)),
luabind::value("Scowls", static_cast<int>(FACTION_SCOWLS))
];
)];
}
luabind::scope lua_register_slot() {
return luabind::class_<Slots>("Slot")
.enum_("constants")
[
[(
luabind::value("Charm", static_cast<int>(EQ::invslot::slotCharm)),
luabind::value("Ear1", static_cast<int>(EQ::invslot::slotEar1)),
luabind::value("Head", static_cast<int>(EQ::invslot::slotHead)),
@@ -4679,13 +4679,13 @@ luabind::scope lua_register_slot() {
luabind::value("PersonalBegin", static_cast<int>(EQ::invslot::GENERAL_BEGIN)), // deprecated
luabind::value("PersonalEnd", static_cast<int>(EQ::invslot::GENERAL_END)), // deprecated
luabind::value("CursorEnd", 0xFFFE) // deprecated (not in use..and never valid vis-a-vis client behavior)
];
)];
}
luabind::scope lua_register_material() {
return luabind::class_<Materials>("Material")
.enum_("constants")
[
[(
luabind::value("Head", static_cast<int>(EQ::textures::armorHead)),
luabind::value("Chest", static_cast<int>(EQ::textures::armorChest)),
luabind::value("Arms", static_cast<int>(EQ::textures::armorArms)),
@@ -4700,13 +4700,13 @@ luabind::scope lua_register_material() {
luabind::value("Bracer", static_cast<int>(EQ::textures::armorWrist)), // deprecated
luabind::value("Max", static_cast<int>(EQ::textures::materialCount)) // deprecated
];
)];
}
luabind::scope lua_register_client_version() {
return luabind::class_<ClientVersions>("ClientVersion")
.enum_("constants")
[
[(
luabind::value("Unknown", static_cast<int>(EQ::versions::ClientVersion::Unknown)),
luabind::value("Titanium", static_cast<int>(EQ::versions::ClientVersion::Titanium)),
luabind::value("SoF", static_cast<int>(EQ::versions::ClientVersion::SoF)),
@@ -4715,25 +4715,25 @@ luabind::scope lua_register_client_version() {
luabind::value("UF", static_cast<int>(EQ::versions::ClientVersion::UF)),
luabind::value("RoF", static_cast<int>(EQ::versions::ClientVersion::RoF)),
luabind::value("RoF2", static_cast<int>(EQ::versions::ClientVersion::RoF2))
];
)];
}
luabind::scope lua_register_appearance() {
return luabind::class_<Appearances>("Appearance")
.enum_("constants")
[
[(
luabind::value("Standing", static_cast<int>(eaStanding)),
luabind::value("Sitting", static_cast<int>(eaSitting)),
luabind::value("Crouching", static_cast<int>(eaCrouching)),
luabind::value("Dead", static_cast<int>(eaDead)),
luabind::value("Looting", static_cast<int>(eaLooting))
];
)];
}
luabind::scope lua_register_classes() {
return luabind::class_<Classes>("Class")
.enum_("constants")
[
[(
luabind::value("WARRIOR", WARRIOR),
luabind::value("CLERIC", CLERIC),
luabind::value("PALADIN", PALADIN),
@@ -4779,13 +4779,13 @@ luabind::scope lua_register_classes() {
luabind::value("FELLOWSHIP_MASTER", FELLOWSHIP_MASTER),
luabind::value("ALT_CURRENCY_MERCHANT", ALT_CURRENCY_MERCHANT),
luabind::value("MERCENARY_MASTER", MERCENARY_MASTER)
];
)];
}
luabind::scope lua_register_skills() {
return luabind::class_<Skills>("Skill")
.enum_("constants")
[
[(
luabind::value("1HBlunt", EQ::skills::Skill1HBlunt),
luabind::value("Blunt1H", EQ::skills::Skill1HBlunt),
luabind::value("1HSlashing", EQ::skills::Skill1HSlashing),
@@ -4872,13 +4872,13 @@ luabind::scope lua_register_skills() {
luabind::value("2HPiercing", EQ::skills::Skill2HPiercing),
luabind::value("Piercing2H", EQ::skills::Skill2HPiercing),
luabind::value("HIGHEST_SKILL", EQ::skills::HIGHEST_SKILL)
];
)];
}
luabind::scope lua_register_bodytypes() {
return luabind::class_<BodyTypes>("BT")
.enum_("constants")
[
[(
luabind::value("Humanoid", 1),
luabind::value("Lycanthrope", 2),
luabind::value("Undead", 3),
@@ -4913,13 +4913,13 @@ luabind::scope lua_register_bodytypes() {
luabind::value("SwarmPet", 63),
luabind::value("InvisMan", 66),
luabind::value("Special", 67)
];
)];
}
luabind::scope lua_register_filters() {
return luabind::class_<Filters>("Filter")
.enum_("constants")
[
[(
luabind::value("None", FilterNone),
luabind::value("GuildChat", FilterGuildChat),
luabind::value("Socials", FilterSocials),
@@ -4949,13 +4949,13 @@ luabind::scope lua_register_filters() {
luabind::value("Unknown26", FilterUnknown26),
luabind::value("Unknown27", FilterUnknown27),
luabind::value("Unknown28", FilterUnknown28)
];
)];
}
luabind::scope lua_register_message_types() {
return luabind::class_<MessageTypes>("MT")
.enum_("constants")
[
[(
luabind::value("White", Chat::White),
luabind::value("DimGray", Chat::DimGray),
luabind::value("Default", Chat::Default),
@@ -5059,13 +5059,13 @@ luabind::scope lua_register_message_types() {
luabind::value("ItemSpeech", Chat::ItemSpeech),
luabind::value("StrikeThrough", Chat::StrikeThrough),
luabind::value("Stun", Chat::Stun)
];
)];
}
luabind::scope lua_register_rules_const() {
return luabind::class_<Rule>("Rule")
.enum_("constants")
[
[(
#define RULE_INT(cat, rule, default_value, notes) \
luabind::value(#rule, RuleManager::Int__##rule),
#include "../common/ruletypes.h"
@@ -5080,7 +5080,7 @@ luabind::scope lua_register_rules_const() {
luabind::value(#rule, RuleManager::Bool__##rule),
#include "../common/ruletypes.h"
luabind::value("_BoolRuleCount", RuleManager::_BoolRuleCount)
];
)];
}
luabind::scope lua_register_rulei() {
@@ -5107,24 +5107,24 @@ luabind::scope lua_register_ruleb() {
luabind::scope lua_register_journal_speakmode() {
return luabind::class_<Journal_SpeakMode>("SpeakMode")
.enum_("constants")
[
[(
luabind::value("Raw", static_cast<int>(Journal::SpeakMode::Raw)),
luabind::value("Say", static_cast<int>(Journal::SpeakMode::Say)),
luabind::value("Shout", static_cast<int>(Journal::SpeakMode::Shout)),
luabind::value("EmoteAlt", static_cast<int>(Journal::SpeakMode::EmoteAlt)),
luabind::value("Emote", static_cast<int>(Journal::SpeakMode::Emote)),
luabind::value("Group", static_cast<int>(Journal::SpeakMode::Group))
];
)];
}
luabind::scope lua_register_journal_mode() {
return luabind::class_<Journal_Mode>("JournalMode")
.enum_("constants")
[
[(
luabind::value("None", static_cast<int>(Journal::Mode::None)),
luabind::value("Log1", static_cast<int>(Journal::Mode::Log1)),
luabind::value("Log2", static_cast<int>(Journal::Mode::Log2))
];
)];
}
#endif