mirror of
				https://github.com/OpenMW/openmw.git
				synced 2025-10-31 23:26:41 +00:00 
			
		
		
		
	fix#6451
This commit is contained in:
		
							parent
							
								
									9d7a53b701
								
							
						
					
					
						commit
						01a9eaf4a8
					
				
					 1 changed files with 6 additions and 5 deletions
				
			
		|  | @ -289,13 +289,8 @@ namespace MWMechanics | |||
|         MWWorld::Ptr ptr = getPlayer(); | ||||
|         MWBase::WindowManager *winMgr = MWBase::Environment::get().getWindowManager(); | ||||
| 
 | ||||
|         // Update the equipped weapon icon
 | ||||
|         MWWorld::InventoryStore& inv = ptr.getClass().getInventoryStore(ptr); | ||||
|         MWWorld::ContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight); | ||||
|         if (weapon == inv.end()) | ||||
|             winMgr->unsetSelectedWeapon(); | ||||
|         else | ||||
|             winMgr->setSelectedWeapon(*weapon); | ||||
| 
 | ||||
|         // Update the selected spell icon
 | ||||
|         MWWorld::ContainerStoreIterator enchantItem = inv.getSelectedEnchantItem(); | ||||
|  | @ -310,6 +305,12 @@ namespace MWMechanics | |||
|                 winMgr->unsetSelectedSpell(); | ||||
|         } | ||||
| 
 | ||||
|         // Update the equipped weapon icon
 | ||||
|         if (weapon == inv.end()) | ||||
|             winMgr->unsetSelectedWeapon(); | ||||
|         else | ||||
|             winMgr->setSelectedWeapon(*weapon); | ||||
| 
 | ||||
|         if (mUpdatePlayer) | ||||
|         { | ||||
|             mUpdatePlayer = false; | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue