[Cleanup] Use explicit conversions for enum formatting (#4064)

This is prep for updating to fmt 10 which removed implicit conversions
for enums.
This commit is contained in:
hg 2024-02-12 03:58:48 -05:00 committed by GitHub
parent 20c01ef343
commit e920e35a5c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
21 changed files with 33 additions and 17 deletions

View File

@ -64,4 +64,6 @@ typedef enum {
} bodyType; } bodyType;
/* bodytypes above 64 make the mob not show up */ /* bodytypes above 64 make the mob not show up */
constexpr int format_as(bodyType type) { return static_cast<int>(type); }
#endif #endif

View File

@ -71,6 +71,8 @@ namespace EQ
bit_DeityAll = UINT32_MAX bit_DeityAll = UINT32_MAX
}; };
constexpr int format_as(DeityType type) { return static_cast<int>(type); }
extern DeityTypeBit GetDeityBitmask(DeityType deity_type); extern DeityTypeBit GetDeityBitmask(DeityType deity_type);
extern std::string GetDeityName(DeityType deity_type); extern std::string GetDeityName(DeityType deity_type);
extern const std::map<DeityType, std::string>& GetDeityMap(); extern const std::map<DeityType, std::string>& GetDeityMap();

View File

@ -45,6 +45,7 @@ typedef enum { //EQEmu internal opcodes list
_maxEmuOpcode _maxEmuOpcode
} EmuOpcode; } EmuOpcode;
constexpr int format_as(EmuOpcode opcode) { return static_cast<int>(opcode); }
extern const char *OpcodeNames[_maxEmuOpcode+1]; extern const char *OpcodeNames[_maxEmuOpcode+1];
#endif #endif

View File

@ -81,5 +81,6 @@ typedef enum {
GUILD_ACTION_MEMBERS_DEMOTE_SELF = 30, GUILD_ACTION_MEMBERS_DEMOTE_SELF = 30,
} GuildAction; } GuildAction;
constexpr int format_as(GuildAction action) { return static_cast<int>(action); }
#endif #endif

View File

@ -158,6 +158,7 @@ namespace RoF2
slotCursor slotCursor
}; };
constexpr int16 format_as(InventorySlots slot) { return static_cast<int16>(slot); }
} // namespace enum_ } // namespace enum_
using namespace enum_; using namespace enum_;

View File

@ -162,6 +162,8 @@ namespace EQ
// server profile does not reflect this yet..so, prefixed with 'PACKET_' // server profile does not reflect this yet..so, prefixed with 'PACKET_'
#define PACKET_SKILL_ARRAY_SIZE 100 #define PACKET_SKILL_ARRAY_SIZE 100
constexpr int format_as(SkillType skill) { return static_cast<int>(skill); }
bool IsTradeskill(SkillType skill); bool IsTradeskill(SkillType skill);
bool IsSpecializedSkill(SkillType skill); bool IsSpecializedSkill(SkillType skill);
float GetSkillMeleePushForce(SkillType skill); float GetSkillMeleePushForce(SkillType skill);

View File

@ -252,6 +252,8 @@ typedef enum {
ActivityCompleted = 2 ActivityCompleted = 2
} ActivityState; } ActivityState;
constexpr int format_as(ActivityState state) { return static_cast<int>(state); }
struct ClientActivityInformation { struct ClientActivityInformation {
int activity_id; int activity_id;
int done_count; int done_count;

View File

@ -54,6 +54,8 @@ namespace EQ
tintInvalid = textureInvalid tintInvalid = textureInvalid
}; };
constexpr int format_as(TextureSlot slot) { return static_cast<int>(slot); }
const int8 LastTexture = weaponSecondary; const int8 LastTexture = weaponSecondary;
const int8 LastTintableTexture = tintFeet; const int8 LastTintableTexture = tintFeet;

View File

@ -139,7 +139,7 @@ void ClientListEntry::SetOnline(CLE_Status iOnline)
AccountName(), AccountName(),
AccountID(), AccountID(),
CLEStatusString[CLE_Status::Online], CLEStatusString[CLE_Status::Online],
iOnline static_cast<int>(iOnline)
); );
if (iOnline >= CLE_Status::Online && pOnline < CLE_Status::Online) { if (iOnline >= CLE_Status::Online && pOnline < CLE_Status::Online) {

View File

@ -280,7 +280,7 @@ void ClientList::SendCLEList(const int16& admin, const char* to, WorldTCPConnect
fmt::format_to(std::back_inserter(out), fmt::runtime(newline)); fmt::format_to(std::back_inserter(out), fmt::runtime(newline));
} }
fmt::format_to(std::back_inserter(out), "ID: {} Acc# {} AccName: {} IP: {}", cle->GetID(), cle->AccountID(), cle->AccountName(), inet_ntoa(in)); fmt::format_to(std::back_inserter(out), "ID: {} Acc# {} AccName: {} IP: {}", cle->GetID(), cle->AccountID(), cle->AccountName(), inet_ntoa(in));
fmt::format_to(std::back_inserter(out), "{} Stale: {} Online: {} Admin: {}", newline, cle->GetStaleCounter(), cle->Online(), cle->Admin()); fmt::format_to(std::back_inserter(out), "{} Stale: {} Online: {} Admin: {}", newline, cle->GetStaleCounter(), static_cast<int>(cle->Online()), cle->Admin());
if (cle->LSID()) if (cle->LSID())
fmt::format_to(std::back_inserter(out), "{} LSID: {} LSName: {} WorldAdmin: {}", newline, cle->LSID(), cle->LSName(), cle->WorldAdmin()); fmt::format_to(std::back_inserter(out), "{} LSID: {} LSName: {} WorldAdmin: {}", newline, cle->LSID(), cle->LSName(), cle->WorldAdmin());
if (cle->CharID()) if (cle->CharID())

View File

@ -343,7 +343,7 @@ void NPC::DescribeAggro(Client *to_who, Mob *mob, bool verbose) {
"{} does not have low enough faction, their Faction Level is {} ({}).", "{} does not have low enough faction, their Faction Level is {} ({}).",
to_who->GetTargetDescription(mob), to_who->GetTargetDescription(mob),
FactionValueToString(faction_value), FactionValueToString(faction_value),
faction_value static_cast<int>(faction_value)
).c_str() ).c_str()
); );
return; return;
@ -556,7 +556,7 @@ bool Mob::CheckWillAggro(Mob *mob) {
LogAggro("Is In zone?:[{}]\n", mob->InZone()); LogAggro("Is In zone?:[{}]\n", mob->InZone());
LogAggro("Dist^2: [{}]\n", distance_squared); LogAggro("Dist^2: [{}]\n", distance_squared);
LogAggro("Range^2: [{}]\n", aggro_range_squared); LogAggro("Range^2: [{}]\n", aggro_range_squared);
LogAggro("Faction: [{}]\n", faction_value); LogAggro("Faction: [{}]\n", static_cast<int>(faction_value));
LogAggro("AlwaysAggroFlag: [{}]\n", AlwaysAggro()); LogAggro("AlwaysAggroFlag: [{}]\n", AlwaysAggro());
LogAggro("Int: [{}]\n", GetINT()); LogAggro("Int: [{}]\n", GetINT());
LogAggro("Con: [{}]\n", GetLevelCon(mob->GetLevel())); LogAggro("Con: [{}]\n", GetLevelCon(mob->GetLevel()));

View File

@ -1107,7 +1107,7 @@ void bot_command_stance(Client *c, const Seperator *sep)
fmt::format( fmt::format(
"My current stance is {} ({}).", "My current stance is {} ({}).",
EQ::constants::GetStanceName(bot_iter->GetBotStance()), EQ::constants::GetStanceName(bot_iter->GetBotStance()),
bot_iter->GetBotStance() static_cast<int>(bot_iter->GetBotStance())
).c_str() ).c_str()
); );
} }

View File

@ -6955,7 +6955,7 @@ void Client::ShowXTargets(Client *c)
fmt::format( fmt::format(
"xtarget slot [{}] type [{}] ID [{}] name [{}]", "xtarget slot [{}] type [{}] ID [{}] name [{}]",
i, i,
XTargets[i].Type, static_cast<int>(XTargets[i].Type),
XTargets[i].ID, XTargets[i].ID,
strlen(XTargets[i].Name) ? XTargets[i].Name : "No Name" strlen(XTargets[i].Name) ? XTargets[i].Name : "No Name"
).c_str() ).c_str()

View File

@ -516,7 +516,7 @@ int Client::HandlePacket(const EQApplicationPacket *app)
case CLIENT_LINKDEAD: case CLIENT_LINKDEAD:
break; break;
default: default:
LogDebug("Unknown client_state: [{}]\n", client_state); LogDebug("Unknown client_state: [{}]\n", static_cast<int>(client_state));
break; break;
} }
@ -16342,7 +16342,7 @@ void Client::Handle_OP_XTargetRequest(const EQApplicationPacket *app)
} }
default: default:
LogDebug("Unhandled XTarget Type [{}]", Type); LogDebug("Unhandled XTarget Type [{}]", static_cast<int>(Type));
break; break;
} }

View File

@ -410,7 +410,7 @@ void DataBucket::BulkLoadEntities(DataBucketLoadType::Type t, std::vector<uint32
column = "npc_id"; column = "npc_id";
break; break;
default: default:
LogError("Incorrect LoadType [{}]", t); LogError("Incorrect LoadType [{}]", static_cast<int>(t));
break; break;
} }
@ -546,7 +546,7 @@ void DataBucket::HandleWorldMessage(ServerPacket *p)
n.e.id, n.e.id,
n.e.key_, n.e.key_,
n.e.value, n.e.value,
n.update_action static_cast<int>(n.update_action)
); );
// delete // delete

View File

@ -2521,7 +2521,7 @@ void Mob::SendStatsWindow(Client* c, bool use_window)
CastToClient()->GetPVP() ? "Yes" : "No", CastToClient()->GetPVP() ? "Yes" : "No",
CastToClient()->GetGM() ? "On" : "Off", CastToClient()->GetGM() ? "On" : "Off",
EQ::constants::GetFlyModeName(static_cast<uint8>(flymode)), EQ::constants::GetFlyModeName(static_cast<uint8>(flymode)),
flymode, static_cast<int>(flymode),
CastToClient()->GetGMSpeed() ? "On" : "Off", CastToClient()->GetGMSpeed() ? "On" : "Off",
CastToClient()->GetHideMe() ? "On" : "Off", CastToClient()->GetHideMe() ? "On" : "Off",
CastToClient()->GetGMInvul() ? "On" : "Off", CastToClient()->GetGMInvul() ? "On" : "Off",

View File

@ -1487,7 +1487,7 @@ void MobMovementManager::PushEvadeCombat(MobMovementEntry &mob_movement_entry)
*/ */
void MobMovementManager::HandleStuckBehavior(Mob *who, float x, float y, float z, MobMovementMode mob_movement_mode) void MobMovementManager::HandleStuckBehavior(Mob *who, float x, float y, float z, MobMovementMode mob_movement_mode)
{ {
LogDebug("Handle stuck behavior for {0} at ({1}, {2}, {3}) with movement_mode {4}", who->GetName(), x, y, z, mob_movement_mode); LogDebug("Handle stuck behavior for {0} at ({1}, {2}, {3}) with movement_mode {4}", who->GetName(), x, y, z, static_cast<int>(mob_movement_mode));
auto sb = who->GetStuckBehavior(); auto sb = who->GetStuckBehavior();
MobStuckBehavior behavior = RunToTarget; MobStuckBehavior behavior = RunToTarget;

View File

@ -169,4 +169,7 @@ protected:
TimeOfDay_Struct next_event; TimeOfDay_Struct next_event;
}; };
constexpr int format_as(SpawnCondition::OnChange val) { return static_cast<int>(val); }
constexpr int format_as(SpawnEvent::Action val) { return static_cast<int>(val); }
#endif #endif

View File

@ -407,7 +407,7 @@ bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
spell.target_type == ST_Beam spell.target_type == ST_Beam
) && target_id == 0 ) && target_id == 0
) { ) {
LogSpells("Spell [{}] auto-targeted the caster. Group? [{}], target type [{}]", spell_id, IsGroupSpell(spell_id), spell.target_type); LogSpells("Spell [{}] auto-targeted the caster. Group? [{}], target type [{}]", spell_id, IsGroupSpell(spell_id), static_cast<int>(spell.target_type));
target_id = GetID(); target_id = GetID();
} }
@ -2383,7 +2383,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
default: default:
{ {
LogSpells("I dont know Target Type: [{}] Spell: ([{}]) [{}]", spells[spell_id].target_type, spell_id, spells[spell_id].name); LogSpells("I dont know Target Type: [{}] Spell: ([{}]) [{}]", static_cast<int>(spells[spell_id].target_type), spell_id, spells[spell_id].name);
Message(0, "I dont know Target Type: %d Spell: (%d) %s", spells[spell_id].target_type, spell_id, spells[spell_id].name); Message(0, "I dont know Target Type: %d Spell: (%d) %s", spells[spell_id].target_type, spell_id, spells[spell_id].name);
CastAction = CastActUnknown; CastAction = CastActUnknown;
break; break;
@ -2461,7 +2461,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, in
} }
} }
LogSpells("Spell [{}]: target type [{}], target [{}], AE center [{}]", spell_id, CastAction, spell_target?spell_target->GetName():"NONE", ae_center?ae_center->GetName():"NONE"); LogSpells("Spell [{}]: target type [{}], target [{}], AE center [{}]", spell_id, static_cast<int>(CastAction), spell_target?spell_target->GetName():"NONE", ae_center?ae_center->GetName():"NONE");
// if a spell has the AEDuration flag, it becomes an AE on target // if a spell has the AEDuration flag, it becomes an AE on target
// spell that's recast every 2500 msec for AEDuration msec. // spell that's recast every 2500 msec for AEDuration msec.

View File

@ -256,7 +256,7 @@ bool TaskManager::LoadTasks(int single_task)
activity_id, activity_id,
task_data->activity_count, task_data->activity_count,
static_cast<int32_t>(ad->activity_type), static_cast<int32_t>(ad->activity_type),
ad->goal_method, static_cast<int32_t>(ad->goal_method),
ad->goal_count, ad->goal_count,
ad->zones.c_str(), ad->zones.c_str(),
ad->target_name.c_str(), ad->target_name.c_str(),

View File

@ -746,7 +746,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z
z, z,
heading, heading,
ignorerestrictions, ignorerestrictions,
zm static_cast<int>(zm)
); );
cheat_manager.SetExemptStatus(Port, true); cheat_manager.SetExemptStatus(Port, true);