diff --git a/apps/openmw/mwmp/DedicatedPlayer.cpp b/apps/openmw/mwmp/DedicatedPlayer.cpp index ed9649bb8..870feaeda 100644 --- a/apps/openmw/mwmp/DedicatedPlayer.cpp +++ b/apps/openmw/mwmp/DedicatedPlayer.cpp @@ -286,7 +286,7 @@ DedicatedPlayer *Players::newPlayer(RakNet::RakNetGUID guid) return players[guid.g]; } -void DedicatedPlayer::updateInventory() +void DedicatedPlayer::updateEquipment() { MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr); for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot) diff --git a/apps/openmw/mwmp/DedicatedPlayer.hpp b/apps/openmw/mwmp/DedicatedPlayer.hpp index 5f6d5e5d0..f014b56db 100644 --- a/apps/openmw/mwmp/DedicatedPlayer.hpp +++ b/apps/openmw/mwmp/DedicatedPlayer.hpp @@ -47,7 +47,7 @@ namespace mwmp MWWorld::ManualRef* getRef(); void move(float dt); void updateDrawState(); - void updateInventory(); + void updateEquipment(); void updateCell(); diff --git a/apps/openmw/mwmp/LocalPlayer.cpp b/apps/openmw/mwmp/LocalPlayer.cpp index 285babe88..8a5bf455c 100644 --- a/apps/openmw/mwmp/LocalPlayer.cpp +++ b/apps/openmw/mwmp/LocalPlayer.cpp @@ -61,7 +61,7 @@ void LocalPlayer::update() updateDrawStateAndFlags(); updateAttackState(); updateDeadState(); - updateEquipped(); + updateEquipment(); updateDynamicStats(); updateAttributes(); updateSkills(); @@ -370,7 +370,7 @@ void LocalPlayer::updateChar() MWBase::Environment::get().getWindowManager()->getInventoryWindow()->rebuildAvatar(); } -void LocalPlayer::updateEquipped(bool forceUpdate) +void LocalPlayer::updateEquipment(bool forceUpdate) { MWWorld::Ptr player = getPlayerPtr(); @@ -765,7 +765,7 @@ void LocalPlayer::setClass() } } -void LocalPlayer::setInventory() +void LocalPlayer::setEquipment() { MWWorld::Ptr ptrPlayer = getPlayerPtr(); diff --git a/apps/openmw/mwmp/LocalPlayer.hpp b/apps/openmw/mwmp/LocalPlayer.hpp index 0b99fc4d6..54eeb0a94 100644 --- a/apps/openmw/mwmp/LocalPlayer.hpp +++ b/apps/openmw/mwmp/LocalPlayer.hpp @@ -30,7 +30,7 @@ namespace mwmp void updatePosition(bool forceUpdate = false); void updateCell(bool forceUpdate = false); void updateChar(); - void updateEquipped(bool forceUpdate = false); + void updateEquipment(bool forceUpdate = false); void updateInventory(bool forceUpdate = false); void updateAttackState(bool forceUpdate = false); void updateDeadState(bool forceUpdate = false); @@ -43,7 +43,7 @@ namespace mwmp void setPosition(); void setCell(); void setClass(); - void setInventory(); + void setEquipment(); void sendClass(); void sendInventory(); diff --git a/apps/openmw/mwmp/Networking.cpp b/apps/openmw/mwmp/Networking.cpp index 337c42d75..4aca456ae 100644 --- a/apps/openmw/mwmp/Networking.cpp +++ b/apps/openmw/mwmp/Networking.cpp @@ -270,18 +270,18 @@ void Networking::processPlayerPacket(RakNet::Packet *packet) { if (packet->length == myPacket->headerSize()) { - getLocalPlayer()->updateEquipped(true); + getLocalPlayer()->updateEquipment(true); } else { myPacket->Packet(&bsIn, getLocalPlayer(), false); - getLocalPlayer()->setInventory(); + getLocalPlayer()->setEquipment(); } } else if (pl != 0) { myPacket->Packet(&bsIn, pl, false); - pl->updateInventory(); + pl->updateEquipment(); } break; } @@ -329,7 +329,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet) itemPtr.getCellRef().setCharge(item.health); printf("%s %d %d\n", item.refid.c_str(), item.count, item.health); } - getLocalPlayer()->setInventory(); // restore equipped items + getLocalPlayer()->setEquipment(); // restore equipped items } } }