teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Only update the icon if player is NOT unarmed, to avoid bad dereference.

Browse source
This commit is contained in:
Rohit Nirmal 2014-03-26 21:53:35 -05:00
parent bcacdc49af
commit e695890e01
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwstate/statemanagerimp.cpp
View file

@ -307,7 +307,10 @@ void MWState::StateManager::loadGame (const Character *character, const Slot *sl
//Update the weapon icon in the hud with whatever the player is currently holding. //Update the weapon icon in the hud with whatever the player is currently holding.
MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr); MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr);
MWBase::Environment::get().getWindowManager()->setSelectedWeapon(*invStore.getSlot(MWWorld::InventoryStore::Slot_CarriedRight)); MWWorld::ContainerStoreIterator item = invStore.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
if (item != invStore.end())
MWBase::Environment::get().getWindowManager()->setSelectedWeapon(*item);
ESM::CellId cellId = ptr.getCell()->getCell()->getCellId(); ESM::CellId cellId = ptr.getCell()->getCell()->getCellId();