mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 03:40:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'my_other_mr_is_larger' into 'master'

Browse Source 
Make AddItem's quantity overflow on negative numbers

Closes #5934

See merge request OpenMW/openmw!713
This commit is contained in:
psi29a 2021-04-05 11:45:31 +00:00
commit 9aa5aef2c6
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

@ -115,6 +115,7 @@
Bug #5906: Sunglare doesn't work with Mesa drivers and AMD GPUs Bug #5906: Sunglare doesn't work with Mesa drivers and AMD GPUs
Bug #5912: ImprovedBound mod doesn't work Bug #5912: ImprovedBound mod doesn't work
Bug #5914: BM: The Swimmer can't reach destination Bug #5914: BM: The Swimmer can't reach destination
Bug #5934: AddItem command doesn't accept negative values
Feature #390: 3rd person look "over the shoulder" Feature #390: 3rd person look "over the shoulder"
Feature #832: OpenMW-CS: Handle deleted references Feature #832: OpenMW-CS: Handle deleted references
Feature #1536: Show more information about level on menu Feature #1536: Show more information about level on menu

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

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