AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-22 11:23:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Issue #370: replaced custom target handling in apply action with base class implementation

Browse Source
This commit is contained in:
Marc Zinnschlag 2012-09-04 15:18:59 +02:00
parent 733654d730
commit cc55056adf
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/openmw/mwworld/actionapply.cpp
View File

@ -6,23 +6,23 @@
namespace MWWorld
{
ActionApply::ActionApply (const Ptr& target, const std::string& id)
: mTarget (target), mId (id)
: Action (false, target), mId (id)
{}
void ActionApply::executeImp (const Ptr& actor)
{
MWWorld::Class::get (mTarget).apply (mTarget, mId, actor);
MWWorld::Class::get (getTarget()).apply (getTarget(), mId, actor);
}
ActionApplyWithSkill::ActionApplyWithSkill (const Ptr& target, const std::string& id,
int skillIndex, int usageType)
: mTarget (target), mId (id), mSkillIndex (skillIndex), mUsageType (usageType)
: Action (false, target), mId (id), mSkillIndex (skillIndex), mUsageType (usageType)
{}
void ActionApplyWithSkill::executeImp (const Ptr& actor)
{
if (MWWorld::Class::get (mTarget).apply (mTarget, mId, actor) && mUsageType!=-1)
MWWorld::Class::get (mTarget).skillUsageSucceeded (actor, mSkillIndex, mUsageType);
if (MWWorld::Class::get (getTarget()).apply (getTarget(), mId, actor) && mUsageType!=-1)
MWWorld::Class::get (getTarget()).skillUsageSucceeded (actor, mSkillIndex, mUsageType);
}
}

2
apps/openmw/mwworld/actionapply.hpp
View File

@ -11,7 +11,6 @@ namespace MWWorld
{
class ActionApply : public Action
{
Ptr mTarget;
std::string mId;
virtual void executeImp (const Ptr& actor);
@ -23,7 +22,6 @@ namespace MWWorld
class ActionApplyWithSkill : public Action
{
Ptr mTarget;
std::string mId;
int mSkillIndex;
int mUsageType;