mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 06:53:52 +00:00
Code Issues Releases Wiki Activity

Merged pull request #1875

Browse source
This commit is contained in:
Marc Zinnschlag 2018-08-17 09:37:12 +02:00
commit ebdb991225
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -15,6 +15,7 @@
Bug #2872: Tab completion in console doesn't work with explicit reference Bug #2872: Tab completion in console doesn't work with explicit reference
Bug #2971: Compiler did not reject lines with naked expressions beginning with x.y Bug #2971: Compiler did not reject lines with naked expressions beginning with x.y
Bug #3049: Drain and Fortify effects are not properly applied on health, magicka and fatigue Bug #3049: Drain and Fortify effects are not properly applied on health, magicka and fatigue
Bug #3072: Fatal error on AddItem <item> that has a script containing Equip <item>
Bug #3249: Fixed revert function not updating views properly Bug #3249: Fixed revert function not updating views properly
Bug #3374: Touch spells not hitting kwama foragers Bug #3374: Touch spells not hitting kwama foragers
Bug #3486: [Mod] NPC Commands does not work Bug #3486: [Mod] NPC Commands does not work

2
apps/openmw/mwgui/inventorywindow.cpp
View file

@ -517,7 +517,7 @@ namespace MWGui
// Give the script a chance to run once before we do anything else // Give the script a chance to run once before we do anything else
// this is important when setting pcskipequip as a reaction to onpcequip being set (bk_treasuryreport does this) // this is important when setting pcskipequip as a reaction to onpcequip being set (bk_treasuryreport does this)
if (!script.empty() && MWBase::Environment::get().getWorld()->getScriptsEnabled()) if (!force && !script.empty() && MWBase::Environment::get().getWorld()->getScriptsEnabled())
{ {
MWScript::InterpreterContext interpreterContext (&ptr.getRefData().getLocals(), ptr); MWScript::InterpreterContext interpreterContext (&ptr.getRefData().getLocals(), ptr);
MWBase::Environment::get().getScriptManager()->run (script, interpreterContext); MWBase::Environment::get().getScriptManager()->run (script, interpreterContext);

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

@ -192,8 +192,9 @@ namespace MWScript
if (it == invStore.end()) if (it == invStore.end())
{ {
it = ptr.getClass().getContainerStore (ptr).add (item, 1, ptr); it = ptr.getClass().getContainerStore (ptr).add (item, 1, ptr);
Log(Debug::Warning) << "Implicitly adding one " << item << " to container " Log(Debug::Warning) << "Implicitly adding one " << item <<
"to fulfil requirements of Equip instruction"; " to the inventory store of " << ptr.getCellRef().getRefId() <<
" to fulfill the requirements of Equip instruction";
} }
if (ptr == MWMechanics::getPlayer()) if (ptr == MWMechanics::getPlayer())