mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 06:41:36 +00:00
Code Issues Releases Wiki Activity

OnActivate is triggered when the item is picked up

Browse source
This commit is contained in:
rexelion 2017-10-31 18:16:40 +00:00
parent e8743f3f79
commit a9e5e19482
4 changed files with 10 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,6 @@
#include "inventorywindow.hpp" #include "inventorywindow.hpp"
#include <stdexcept> #include <stdexcept>
#include <algorithm>
#include <MyGUI_Window.h> #include <MyGUI_Window.h>
#include <MyGUI_ImageBox.h> #include <MyGUI_ImageBox.h>
@ -150,15 +149,6 @@ namespace MWGui
mItemView->setModel(NULL); mItemView->setModel(NULL);
} }
void InventoryWindow::activateItems()
{
for (std::vector<MWWorld::Ptr>::iterator it = mItemsToActivate.begin(); it != mItemsToActivate.end(); it++)
{
it->getRefData().activate();
}
mItemsToActivate.clear();
}
void InventoryWindow::setGuiMode(GuiMode mode) void InventoryWindow::setGuiMode(GuiMode mode)
{ {
std::string setting = "inventory"; std::string setting = "inventory";
@ -663,15 +653,6 @@ namespace MWGui
if (object.getClass().getName(object) == "") // objects without name presented to user can never be picked up if (object.getClass().getName(object) == "") // objects without name presented to user can never be picked up
return; return;
if (object.getRefData().hasSuppressActivate()) // if Flag_SuppressActivate is set, script that contains OnActivate is attached to the item
{
if (std::find(mItemsToActivate.begin(), mItemsToActivate.end(), object) == mItemsToActivate.end())
{
mItemsToActivate.push_back(object);
}
return;
}
int count = object.getRefData().getCount(); int count = object.getRefData().getCount();
MWWorld::Ptr player = MWMechanics::getPlayer(); MWWorld::Ptr player = MWMechanics::getPlayer();
@ -682,6 +663,13 @@ namespace MWGui
// add to player inventory // add to player inventory
// can't use ActionTake here because we need an MWWorld::Ptr to the newly inserted object // can't use ActionTake here because we need an MWWorld::Ptr to the newly inserted object
MWWorld::Ptr newObject = *player.getClass().getContainerStore (player).add (object, object.getRefData().getCount(), player); MWWorld::Ptr newObject = *player.getClass().getContainerStore (player).add (object, object.getRefData().getCount(), player);
if (object.getRefData().hasSuppressActivate()) // if Flag_SuppressActivate is set, script that contains OnActivate is attached to the item
{
newObject.getRefData().onActivate(); // set the flag_SuppressActivate flag for the new item
newObject.getRefData().activate();
}
// remove from world // remove from world
MWBase::Environment::get().getWorld()->deleteObject (object); MWBase::Environment::get().getWorld()->deleteObject (object);

4
apps/openmw/mwgui/inventorywindow.hpp
View file

@ -58,8 +58,6 @@ namespace MWGui
void clear(); void clear();
void activateItems();
void useItem(const MWWorld::Ptr& ptr); void useItem(const MWWorld::Ptr& ptr);
void setGuiMode(GuiMode mode); void setGuiMode(GuiMode mode);
@ -72,8 +70,6 @@ namespace MWGui
int mSelectedItem; int mSelectedItem;
std::vector<MWWorld::Ptr> mItemsToActivate;
MWWorld::Ptr mPtr; MWWorld::Ptr mPtr;
MWGui::ItemView* mItemView; MWGui::ItemView* mItemView;

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

@ -1171,8 +1171,6 @@ namespace MWGui
mGuiModeStates[mode].update(false); mGuiModeStates[mode].update(false);
if (!noSound) if (!noSound)
playSound(mGuiModeStates[mode].mCloseSound); playSound(mGuiModeStates[mode].mCloseSound);
if (mode == GM_Inventory)
mInventoryWindow->activateItems(); // Activate cursed items when inventory is closed
} }
if (!mGuiModes.empty()) if (!mGuiModes.empty())

3
apps/openmw/mwworld/actiontake.cpp
View file

@ -14,6 +14,9 @@ namespace MWWorld
void ActionTake::executeImp (const Ptr& actor) void ActionTake::executeImp (const Ptr& actor)
{ {
//No need to do anything if moving items from the player's inventory back into player's inventory
if (actor == MWBase::Environment::get().getWorld()->getPlayerPtr() && getTarget().getCell() == 0)
return;
MWBase::Environment::get().getMechanicsManager()->itemTaken( MWBase::Environment::get().getMechanicsManager()->itemTaken(
actor, getTarget(), MWWorld::Ptr(), getTarget().getRefData().getCount()); actor, getTarget(), MWWorld::Ptr(), getTarget().getRefData().getCount());
MWWorld::Ptr newitem = *actor.getClass().getContainerStore (actor).add (getTarget(), getTarget().getRefData().getCount(), actor); MWWorld::Ptr newitem = *actor.getClass().getContainerStore (actor).add (getTarget(), getTarget().getRefData().getCount(), actor);