krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Remove redundant setLocals (already done by ContainerStore::add)

Browse source
This commit is contained in:
scrawl 2013-11-21 06:27:19 +01:00
parent 61ab6e1739
commit b490e56ba1
2 changed files with 3 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,15 +54,6 @@ namespace MWScript
MWWorld::Ptr itemPtr = *ptr.getClass().getContainerStore (ptr).add (item, count, ptr);
// Configure item's script variables
std::string script = MWWorld::Class::get(itemPtr).getScript(itemPtr);
if (script != "")
{
const ESM::Script *esmscript = MWBase::Environment::get().getWorld()->getStore().get<ESM::Script>().find (script);
itemPtr.getRefData().setLocals(*esmscript);
}
// Spawn a messagebox (only for items added to player's inventory and if player is talking to someone)
if (ptr == MWBase::Environment::get().getWorld ()->getPlayer ().getPlayer() )
{

16
apps/openmw/mwworld/worldimp.cpp
View file

@ -1967,23 +1967,13 @@ namespace MWWorld
if(werewolf)
{
ManualRef ref(getStore(), "WerewolfRobe");
InventoryStore &inv = actor.getClass().getInventoryStore(actor);
// Configure item's script variables
std::string script = Class::get(ref.getPtr()).getScript(ref.getPtr());
if(script != "")
{
const ESM::Script *esmscript = getStore().get<ESM::Script>().find(script);
ref.getPtr().getRefData().setLocals(*esmscript);
}
// Not sure this is right
InventoryStore &inv = Class::get(actor).getInventoryStore(actor);
inv.equip(InventoryStore::Slot_Robe, inv.add(ref.getPtr(), actor), actor);
inv.equip(InventoryStore::Slot_Robe, inv.ContainerStore::add("WerewolfRobe", 1, actor), actor);
}
else
{
Class::get(actor).getContainerStore(actor).remove("WerewolfRobe", 1, actor);
actor.getClass().getContainerStore(actor).remove("WerewolfRobe", 1, actor);
}
if(actor.getRefData().getHandle() == "player")