mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 03:35:27 +00:00
Code Issues Projects Releases Wiki Activity

Fix shield displaying on inventory avatar (bug #4720)

Browse Source
This commit is contained in:
Andrei Kortunov 2018-11-17 22:19:52 +04:00
parent a354879477
commit 7438e20ee1
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -6,6 +6,7 @@
Bug #4701: PrisonMarker record is not hardcoded like other markers Bug #4701: PrisonMarker record is not hardcoded like other markers
Bug #4714: Crash upon game load in the repair menu while the "Your repair failed!" message is active Bug #4714: Crash upon game load in the repair menu while the "Your repair failed!" message is active
Bug #4715: "Cannot get class of an empty object" exception after pressing ESC in the dialogue mode Bug #4715: "Cannot get class of an empty object" exception after pressing ESC in the dialogue mode
Bug #4720: Inventory avatar has shield with two-handed weapon during [un]equipping animation
Feature #2229: Improve pathfinding AI Feature #2229: Improve pathfinding AI
Feature #3442: Default values for fallbacks from ini file Feature #3442: Default values for fallbacks from ini file
Feature #4673: Weapon sheathing Feature #4673: Weapon sheathing

27
apps/openmw/mwrender/characterpreview.cpp
View File

@ -305,24 +305,37 @@ namespace MWRender
type == ESM::Weapon::LongBladeOneHand || type == ESM::Weapon::LongBladeOneHand ||
type == ESM::Weapon::BluntOneHand || type == ESM::Weapon::BluntOneHand ||
type == ESM::Weapon::AxeOneHand || type == ESM::Weapon::AxeOneHand ||
type == ESM::Weapon::MarksmanThrown || type == ESM::Weapon::MarksmanThrown)
type == ESM::Weapon::MarksmanCrossbow || {
type == ESM::Weapon::MarksmanBow)
groupname = "inventoryweapononehand"; groupname = "inventoryweapononehand";
}
else if(type == ESM::Weapon::MarksmanCrossbow ||
type == ESM::Weapon::MarksmanBow)
{
groupname = "inventoryweapononehand";
showCarriedLeft = false;
}
else if(type == ESM::Weapon::LongBladeTwoHand || else if(type == ESM::Weapon::LongBladeTwoHand ||
type == ESM::Weapon::BluntTwoClose || type == ESM::Weapon::BluntTwoClose ||
type == ESM::Weapon::AxeTwoHand) type == ESM::Weapon::AxeTwoHand)
{
groupname = "inventoryweapontwohand"; groupname = "inventoryweapontwohand";
showCarriedLeft = false;
}
else if(type == ESM::Weapon::BluntTwoWide || else if(type == ESM::Weapon::BluntTwoWide ||
type == ESM::Weapon::SpearTwoWide) type == ESM::Weapon::SpearTwoWide)
{
groupname = "inventoryweapontwowide"; groupname = "inventoryweapontwowide";
showCarriedLeft = false;
}
else else
{
groupname = "inventoryhandtohand"; groupname = "inventoryhandtohand";
showCarriedLeft = false;
showCarriedLeft = (iter->getClass().canBeEquipped(*iter, mCharacter).first != 2); }
} }
else else
groupname = "inventoryhandtohand"; groupname = "inventoryhandtohand";
} }
mAnimation->showCarriedLeft(showCarriedLeft); mAnimation->showCarriedLeft(showCarriedLeft);