mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-05-08 16:11:27 +00:00
Code Issues Releases Wiki Activity

Merge branch 'removeitem' into 'master'

Browse source 
Properly handle negative count RemoveItem (bug #6895)

Closes #6895

See merge request OpenMW/openmw!2180
This commit is contained in:
jvoisin 2022-07-24 19:02:09 +00:00
commit b942d70c3c
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -132,6 +132,7 @@
Bug #6794: Light sources are attached to mesh bounds centers instead of mesh origins when AttachLight NiNode is missing Bug #6794: Light sources are attached to mesh bounds centers instead of mesh origins when AttachLight NiNode is missing
Bug #6799: Game crashes if an NPC has no Class attached Bug #6799: Game crashes if an NPC has no Class attached
Bug #6849: ImageButton texture is not scaled properly Bug #6849: ImageButton texture is not scaled properly
Bug #6895: Removing a negative number of items from a script, makes the script terminate with an error
Feature #890: OpenMW-CS: Column filtering Feature #890: OpenMW-CS: Column filtering
Feature #1465: "Reset" argument for AI functions Feature #1465: "Reset" argument for AI functions
Feature #2491: Ability to make OpenMW "portable" Feature #2491: Ability to make OpenMW "portable"

2
apps/openmw/mwscript/containerextensions.cpp
View file

@ -216,7 +216,7 @@ namespace MWScript
runtime.pop(); runtime.pop();
if (count<0) if (count<0)
throw std::runtime_error ("second argument for RemoveItem must be non-negative"); count = static_cast<uint16_t>(count);
// no-op // no-op
if (count == 0) if (count == 0)