diff --git a/apps/openmw-mp/Script/Functions/Mechanics.cpp b/apps/openmw-mp/Script/Functions/Mechanics.cpp index 2635748bc..57790932a 100644 --- a/apps/openmw-mp/Script/Functions/Mechanics.cpp +++ b/apps/openmw-mp/Script/Functions/Mechanics.cpp @@ -100,7 +100,7 @@ const char *MechanicsFunctions::GetCreatureRefId(unsigned short pid) noexcept return player->creatureRefId.c_str(); } -bool MechanicsFunctions::DisplaysCreatureName(unsigned short pid) noexcept +bool MechanicsFunctions::GetCreatureNameDisplayState(unsigned short pid) noexcept { Player *player; GET_PLAYER(pid, player, 0); diff --git a/apps/openmw-mp/Script/Functions/Mechanics.hpp b/apps/openmw-mp/Script/Functions/Mechanics.hpp index 24b91344c..31e379401 100644 --- a/apps/openmw-mp/Script/Functions/Mechanics.hpp +++ b/apps/openmw-mp/Script/Functions/Mechanics.hpp @@ -6,34 +6,34 @@ #define MECHANICSAPI \ {"GetMiscellaneousChangeType", MechanicsFunctions::GetMiscellaneousChangeType},\ \ - {"GetMarkCell", MechanicsFunctions::GetMarkCell},\ - {"GetMarkPosX", MechanicsFunctions::GetMarkPosX},\ - {"GetMarkPosY", MechanicsFunctions::GetMarkPosY},\ - {"GetMarkPosZ", MechanicsFunctions::GetMarkPosZ},\ - {"GetMarkRotX", MechanicsFunctions::GetMarkRotX},\ - {"GetMarkRotZ", MechanicsFunctions::GetMarkRotZ},\ - {"GetSelectedSpellId", MechanicsFunctions::GetSelectedSpellId},\ + {"GetMarkCell", MechanicsFunctions::GetMarkCell},\ + {"GetMarkPosX", MechanicsFunctions::GetMarkPosX},\ + {"GetMarkPosY", MechanicsFunctions::GetMarkPosY},\ + {"GetMarkPosZ", MechanicsFunctions::GetMarkPosZ},\ + {"GetMarkRotX", MechanicsFunctions::GetMarkRotX},\ + {"GetMarkRotZ", MechanicsFunctions::GetMarkRotZ},\ + {"GetSelectedSpellId", MechanicsFunctions::GetSelectedSpellId},\ \ - {"GetScale", MechanicsFunctions::GetScale},\ - {"IsWerewolf", MechanicsFunctions::IsWerewolf},\ - {"GetCreatureRefId", MechanicsFunctions::GetCreatureRefId},\ - {"DisplaysCreatureName", MechanicsFunctions::DisplaysCreatureName},\ + {"GetScale", MechanicsFunctions::GetScale},\ + {"IsWerewolf", MechanicsFunctions::IsWerewolf},\ + {"GetCreatureRefId", MechanicsFunctions::GetCreatureRefId},\ + {"GetCreatureNameDisplayState", MechanicsFunctions::GetCreatureNameDisplayState},\ \ - {"SetMarkCell", MechanicsFunctions::SetMarkCell},\ - {"SetMarkPos", MechanicsFunctions::SetMarkPos},\ - {"SetMarkRot", MechanicsFunctions::SetMarkRot},\ - {"SetSelectedSpellId", MechanicsFunctions::SetSelectedSpellId},\ + {"SetMarkCell", MechanicsFunctions::SetMarkCell},\ + {"SetMarkPos", MechanicsFunctions::SetMarkPos},\ + {"SetMarkRot", MechanicsFunctions::SetMarkRot},\ + {"SetSelectedSpellId", MechanicsFunctions::SetSelectedSpellId},\ \ - {"SetScale", MechanicsFunctions::SetScale},\ - {"SetWerewolfState", MechanicsFunctions::SetWerewolfState},\ - {"SetCreatureRefId", MechanicsFunctions::SetCreatureRefId},\ + {"SetScale", MechanicsFunctions::SetScale},\ + {"SetWerewolfState", MechanicsFunctions::SetWerewolfState},\ + {"SetCreatureRefId", MechanicsFunctions::SetCreatureRefId},\ \ - {"SendMarkLocation", MechanicsFunctions::SendMarkLocation},\ - {"SendSelectedSpell", MechanicsFunctions::SendSelectedSpell},\ - {"SendShapeshift", MechanicsFunctions::SendShapeshift},\ + {"SendMarkLocation", MechanicsFunctions::SendMarkLocation},\ + {"SendSelectedSpell", MechanicsFunctions::SendSelectedSpell},\ + {"SendShapeshift", MechanicsFunctions::SendShapeshift},\ \ - {"Jail", MechanicsFunctions::Jail},\ - {"Resurrect", MechanicsFunctions::Resurrect} + {"Jail", MechanicsFunctions::Jail},\ + {"Resurrect", MechanicsFunctions::Resurrect} class MechanicsFunctions { @@ -138,7 +138,7 @@ public: * \param pid The player ID. * \return The creature name display state. */ - static bool DisplaysCreatureName(unsigned short pid) noexcept; + static bool GetCreatureNameDisplayState(unsigned short pid) noexcept; /** * \brief Set the Mark cell of a player.