mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-26 23:11:33 +00:00
Code Issues Releases Wiki Activity

Convert static const to constexpr where possible

Browse source
This commit is contained in:
elsid 2022-07-04 22:16:26 +02:00
parent 2ec757ab0f
commit ae4ec0a1d0
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/openmw/mwmechanics/actors.cpp
View file

@ -230,10 +230,10 @@ void removeTemporaryEffects(const MWWorld::Ptr& ptr)
namespace MWMechanics namespace MWMechanics
{ {
static const int GREETING_SHOULD_START = 4; // how many updates should pass before NPC can greet player static constexpr int GREETING_SHOULD_START = 4; // how many updates should pass before NPC can greet player
static const int GREETING_SHOULD_END = 20; // how many updates should pass before NPC stops turning to player static constexpr int GREETING_SHOULD_END = 20; // how many updates should pass before NPC stops turning to player
static const int GREETING_COOLDOWN = 40; // how many updates should pass before NPC can continue movement static constexpr int GREETING_COOLDOWN = 40; // how many updates should pass before NPC can continue movement
static const float DECELERATE_DISTANCE = 512.f; static constexpr float DECELERATE_DISTANCE = 512.f;
namespace namespace
{ {
@ -1111,8 +1111,8 @@ namespace MWMechanics
void Actors::updateProcessingRange() void Actors::updateProcessingRange()
{ {
// We have to cap it since using high values (larger than 7168) will make some quests harder or impossible to complete (bug #1876) // We have to cap it since using high values (larger than 7168) will make some quests harder or impossible to complete (bug #1876)
static const float maxRange = 7168.f; static constexpr float maxRange = 7168.f;
static const float minRange = maxRange / 2.f; static constexpr float minRange = maxRange / 2.f;
mActorsProcessingRange = std::clamp(Settings::Manager::getFloat("actors processing range", "Game"), minRange, maxRange); mActorsProcessingRange = std::clamp(Settings::Manager::getFloat("actors processing range", "Game"), minRange, maxRange);
} }