From 678edffb5af3bdc61e5c0cd54b868746544321c3 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Sun, 16 Apr 2017 14:11:55 +0300 Subject: [PATCH] [Client] Rename updateDynamicStats() into updateStatsDynamic() --- apps/openmw/mwclass/npc.cpp | 2 +- apps/openmw/mwmp/LocalPlayer.cpp | 6 +++--- apps/openmw/mwmp/LocalPlayer.hpp | 2 +- apps/openmw/mwmp/Main.cpp | 2 +- apps/openmw/mwmp/Networking.cpp | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp index ef5b7a1da..d74410a18 100644 --- a/apps/openmw/mwclass/npc.cpp +++ b/apps/openmw/mwclass/npc.cpp @@ -885,7 +885,7 @@ namespace MWClass if (ptr == MWMechanics::getPlayer()) { - mwmp::Main::get().getLocalPlayer()->updateDynamicStats(true); + mwmp::Main::get().getLocalPlayer()->updateStatsDynamic(true); mwmp::Main::get().getLocalPlayer()->updatePosition(true); // fix position after getting damage; } } diff --git a/apps/openmw/mwmp/LocalPlayer.cpp b/apps/openmw/mwmp/LocalPlayer.cpp index 564913052..ca431d18c 100644 --- a/apps/openmw/mwmp/LocalPlayer.cpp +++ b/apps/openmw/mwmp/LocalPlayer.cpp @@ -74,7 +74,7 @@ void LocalPlayer::update() updateAttackState(); updateDeadState(); updateEquipment(); - updateDynamicStats(); + updateStatsDynamic(); updateAttributes(); updateSkills(); updateLevel(); @@ -141,7 +141,7 @@ bool LocalPlayer::charGenThread() // only happens for new characters if (charGenStage.end != 1) { - updateDynamicStats(true); + updateStatsDynamic(true); updateAttributes(true); updateSkills(true); updateLevel(true); @@ -165,7 +165,7 @@ bool LocalPlayer::hasFinishedCharGen() return charGenStage.end == 0; } -void LocalPlayer::updateDynamicStats(bool forceUpdate) +void LocalPlayer::updateStatsDynamic(bool forceUpdate) { MWWorld::Ptr player = getPlayerPtr(); diff --git a/apps/openmw/mwmp/LocalPlayer.hpp b/apps/openmw/mwmp/LocalPlayer.hpp index b4dbe4ee9..0d12df168 100644 --- a/apps/openmw/mwmp/LocalPlayer.hpp +++ b/apps/openmw/mwmp/LocalPlayer.hpp @@ -24,7 +24,7 @@ namespace mwmp bool charGenThread(); // return true if CGStage::current == CGStage::end bool hasFinishedCharGen(); - void updateDynamicStats(bool forceUpdate = false); + void updateStatsDynamic(bool forceUpdate = false); void updateAttributes(bool forceUpdate = false); void updateSkills(bool forceUpdate = false); void updateLevel(bool forceUpdate = false); diff --git a/apps/openmw/mwmp/Main.cpp b/apps/openmw/mwmp/Main.cpp index 2e6613107..11094f824 100644 --- a/apps/openmw/mwmp/Main.cpp +++ b/apps/openmw/mwmp/Main.cpp @@ -205,7 +205,7 @@ void Main::updateWorld(float dt) const mNetworking->getPlayerPacket(ID_LOADED)->setPlayer(getLocalPlayer()); mNetworking->getPlayerPacket(ID_PLAYER_BASEINFO)->Send(); mNetworking->getPlayerPacket(ID_LOADED)->Send(); - mLocalPlayer->updateDynamicStats(true); + mLocalPlayer->updateStatsDynamic(true); get().getGUIController()->setChatVisible(true); } else diff --git a/apps/openmw/mwmp/Networking.cpp b/apps/openmw/mwmp/Networking.cpp index 021325207..cf26d6cde 100644 --- a/apps/openmw/mwmp/Networking.cpp +++ b/apps/openmw/mwmp/Networking.cpp @@ -504,7 +504,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet) { if (packet->length == myPacket->headerSize()) { - getLocalPlayer()->updateDynamicStats(true); + getLocalPlayer()->updateStatsDynamic(true); } else { @@ -576,7 +576,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet) myPacket->setPlayer(getLocalPlayer()); myPacket->Send(serverAddr); - getLocalPlayer()->updateDynamicStats(true); + getLocalPlayer()->updateStatsDynamic(true); playerPacketController.GetPacket(ID_PLAYER_STATS_DYNAMIC)->setPlayer(getLocalPlayer()); playerPacketController.GetPacket(ID_PLAYER_STATS_DYNAMIC)->Send(serverAddr); }