AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-23 03:47:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'regressions' into 'master'

Browse Source 
Fix recent regressions

See merge request OpenMW/openmw!335
This commit is contained in:
Alexei Dobrohotov 2020-10-09 16:43:55 +00:00
commit f8293536e6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwmechanics/security.cpp
View File

@ -65,7 +65,7 @@ namespace MWMechanics
resultMessage = "#{sLockFail}"; resultMessage = "#{sLockFail}";
} }
lockpick.getCellRef().setCharge(uses-1); lockpick.getCellRef().setCharge(--uses);
if (!uses) if (!uses)
lockpick.getContainerStore()->remove(lockpick, 1, mActor); lockpick.getContainerStore()->remove(lockpick, 1, mActor);
} }
@ -110,7 +110,7 @@ namespace MWMechanics
resultMessage = "#{sTrapFail}"; resultMessage = "#{sTrapFail}";
} }
probe.getCellRef().setCharge(uses-1); probe.getCellRef().setCharge(--uses);
if (!uses) if (!uses)
probe.getContainerStore()->remove(probe, 1, mActor); probe.getContainerStore()->remove(probe, 1, mActor);
} }

2
components/nif/data.cpp
View File

@ -145,7 +145,7 @@ void NiTriStripsData::read(NIFStream *nif)
nif->getUShorts(lengths, numStrips); nif->getUShorts(lengths, numStrips);
// "Has Strips" flag. Exceptionally useful. // "Has Strips" flag. Exceptionally useful.
bool hasStrips = false; bool hasStrips = true;
if (nif->getVersion() > NIFFile::NIFVersion::VER_OB_OLD) if (nif->getVersion() > NIFFile::NIFVersion::VER_OB_OLD)
hasStrips = nif->getBoolean(); hasStrips = nif->getBoolean();
if (!hasStrips || !numStrips) if (!hasStrips || !numStrips)