mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-01 17:15:34 +00:00
Code Issues Releases Wiki Activity

Use player reference instead of pointer

Browse source
This commit is contained in:
Andrei Kortunov 2018-06-12 22:05:00 +04:00
parent acd3cba5fa
commit 9c45cc7e48
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -257,15 +257,14 @@ namespace MWMechanics
if (newItem.isEmpty() || boundPtr != newItem) if (newItem.isEmpty() || boundPtr != newItem)
return; return;
MWWorld::Player& player = MWBase::Environment::get().getWorld()->getPlayer();
// change draw state only if the item is in player's right hand // change draw state only if the item is in player's right hand
if (slot == MWWorld::InventoryStore::Slot_CarriedRight) if (slot == MWWorld::InventoryStore::Slot_CarriedRight)
MWBase::Environment::get().getWorld()->getPlayer().setDrawState(MWMechanics::DrawState_Weapon); player.setDrawState(MWMechanics::DrawState_Weapon);
if (prevItem != store.end()) if (prevItem != store.end())
{ player.setPreviousItem(itemId, prevItem->getCellRef().getRefId());
MWWorld::Player* player = &MWBase::Environment::get().getWorld()->getPlayer();
player->setPreviousItem(itemId, prevItem->getCellRef().getRefId());
}
} }
void Actors::removeBoundItem (const std::string& itemId, const MWWorld::Ptr& actor) void Actors::removeBoundItem (const std::string& itemId, const MWWorld::Ptr& actor)
@ -282,9 +281,9 @@ namespace MWMechanics
if (actor != MWMechanics::getPlayer()) if (actor != MWMechanics::getPlayer())
return; return;
MWWorld::Player* player = &MWBase::Environment::get().getWorld()->getPlayer(); MWWorld::Player& player = MWBase::Environment::get().getWorld()->getPlayer();
std::string prevItemId = player->getPreviousItem(itemId); std::string prevItemId = player.getPreviousItem(itemId);
player->erasePreviousItem(itemId); player.erasePreviousItem(itemId);
if (prevItemId.empty()) if (prevItemId.empty())
return; return;