mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Handle object activation as a werewolf

Browse Source
actorid
Chris Robinson 12 years ago
parent 6110a0ee3b
commit 89c7f5bc70
20 changed files with 116 additions and 124 deletions
Show Stats Download Patch File Download Diff File

10
apps/openmw/mwclass/apparatus.cpp
Unescape Escape View File

@ -60,15 +60,7 @@ namespace MWClass
boost::shared_ptr<MWWorld::Action> Apparatus::activate (const MWWorld::Ptr& ptr,
const MWWorld::Ptr& actor) const
{
if (!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction ());
boost::shared_ptr<MWWorld::Action> action(
new MWWorld::ActionTake (ptr));
action->setSound(getUpSoundId(ptr));
return action;
return defaultItemActivate(ptr, actor);
}
std::string Apparatus::getScript (const MWWorld::Ptr& ptr) const

9
apps/openmw/mwclass/armor.cpp
Unescape Escape View File

@ -65,14 +65,7 @@ namespace MWClass
boost::shared_ptr<MWWorld::Action> Armor::activate (const MWWorld::Ptr& ptr,
const MWWorld::Ptr& actor) const
{
if (!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction ());
boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTake (ptr));
action->setSound(getUpSoundId(ptr));
return action;
return defaultItemActivate(ptr, actor);
}
bool Armor::hasItemHealth (const MWWorld::Ptr& ptr) const

14
apps/openmw/mwclass/book.cpp
Unescape Escape View File

@ -9,6 +9,7 @@
#include "../mwworld/ptr.hpp"
#include "../mwworld/actionread.hpp"
#include "../mwworld/failedaction.hpp"
#include "../mwworld/cellstore.hpp"
#include "../mwworld/physicssystem.hpp"
@ -17,6 +18,8 @@
#include "../mwgui/tooltips.hpp"
#include "../mwmechanics/npcstats.hpp"
namespace MWClass
{
void Book::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
@ -58,8 +61,15 @@ namespace MWClass
boost::shared_ptr<MWWorld::Action> Book::activate (const MWWorld::Ptr& ptr,
const MWWorld::Ptr& actor) const
{
return boost::shared_ptr<MWWorld::Action> (
new MWWorld::ActionRead (ptr));
if(get(actor).isNpc() && get(actor).getNpcStats(actor).isWerewolf())
{
boost::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
// FIXME: Randomize using all WolfItem* sound records
action->setSound("WolfItem1");
return action;
}
return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionRead(ptr));
}
std::string Book::getScript (const MWWorld::Ptr& ptr) const

11
apps/openmw/mwclass/clothing.cpp
Unescape Escape View File

@ -60,16 +60,9 @@ namespace MWClass
}
boost::shared_ptr<MWWorld::Action> Clothing::activate (const MWWorld::Ptr& ptr,
const MWWorld::Ptr& actor) const
const MWWorld::Ptr& actor) const
{
if (!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction ());
boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTake (ptr));
action->setSound(getUpSoundId(ptr));
return action;
return defaultItemActivate(ptr, actor);
}
std::string Clothing::getScript (const MWWorld::Ptr& ptr) const

10
apps/openmw/mwclass/container.cpp
Unescape Escape View File

@ -23,6 +23,8 @@
#include "../mwrender/objects.hpp"
#include "../mwrender/renderinginterface.hpp"
#include "../mwmechanics/npcstats.hpp"
namespace
{
struct CustomData : public MWWorld::CustomData
@ -91,6 +93,14 @@ namespace MWClass
if (!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction ());
if(get(actor).isNpc() && get(actor).getNpcStats(actor).isWerewolf())
{
boost::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
// FIXME: Randomize using all WolfContainer* sound records
action->setSound("WolfContainer1");
return action;
}
const std::string lockedSound = "LockedChest";
const std::string trapActivationSound = "Disarm Trap Fail";

18
apps/openmw/mwclass/creature.cpp
Unescape Escape View File

@ -16,6 +16,7 @@
#include "../mwworld/ptr.hpp"
#include "../mwworld/actiontalk.hpp"
#include "../mwworld/actionopen.hpp"
#include "../mwworld/failedaction.hpp"
#include "../mwworld/customdata.hpp"
#include "../mwworld/containerstore.hpp"
#include "../mwworld/physicssystem.hpp"
@ -25,6 +26,8 @@
#include "../mwgui/tooltips.hpp"
#include "../mwmechanics/npcstats.hpp"
namespace
{
struct CustomData : public MWWorld::CustomData
@ -222,10 +225,17 @@ namespace MWClass
boost::shared_ptr<MWWorld::Action> Creature::activate (const MWWorld::Ptr& ptr,
const MWWorld::Ptr& actor) const
{
if (MWWorld::Class::get (ptr).getCreatureStats (ptr).isDead())
return boost::shared_ptr<MWWorld::Action> (new MWWorld::ActionOpen(ptr, true));
else
return boost::shared_ptr<MWWorld::Action> (new MWWorld::ActionTalk (ptr));
if(get(actor).isNpc() && get(actor).getNpcStats(actor).isWerewolf())
{
boost::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
// FIXME: Randomize using all WolfCreature* sound records
action->setSound("WolfCreature1");
return action;
}
if(getCreatureStats(ptr).isDead())
return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr, true));
return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionTalk(ptr));
}
MWWorld::ContainerStore& Creature::getContainerStore (const MWWorld::Ptr& ptr)

9
apps/openmw/mwclass/ingredient.cpp
Unescape Escape View File

@ -71,14 +71,7 @@ namespace MWClass
boost::shared_ptr<MWWorld::Action> Ingredient::activate (const MWWorld::Ptr& ptr,
const MWWorld::Ptr& actor) const
{
if (!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction ());
boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTake (ptr));
action->setSound(getUpSoundId(ptr));
return action;
return defaultItemActivate(ptr, actor);
}
std::string Ingredient::getScript (const MWWorld::Ptr& ptr) const

18
apps/openmw/mwclass/light.cpp
Unescape Escape View File

@ -76,20 +76,14 @@ namespace MWClass
boost::shared_ptr<MWWorld::Action> Light::activate (const MWWorld::Ptr& ptr,
const MWWorld::Ptr& actor) const
{
if (!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction ());
if(!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
return boost::shared_ptr<MWWorld::Action>(new MWWorld::NullAction());
MWWorld::LiveCellRef<ESM::Light> *ref =
ptr.get<ESM::Light>();
if (!(ref->mBase->mData.mFlags & ESM::Light::Carry))
return boost::shared_ptr<MWWorld::Action> (new MWWorld::FailedAction);
boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTake (ptr));
MWWorld::LiveCellRef<ESM::Light> *ref = ptr.get<ESM::Light>();
if(!(ref->mBase->mData.mFlags&ESM::Light::Carry))
return boost::shared_ptr<MWWorld::Action>(new MWWorld::FailedAction());
action->setSound(getUpSoundId(ptr));
return action;
return defaultItemActivate(ptr, actor);
}
std::string Light::getScript (const MWWorld::Ptr& ptr) const

9
apps/openmw/mwclass/lockpick.cpp
Unescape Escape View File

@ -61,14 +61,7 @@ namespace MWClass
boost::shared_ptr<MWWorld::Action> Lockpick::activate (const MWWorld::Ptr& ptr,
const MWWorld::Ptr& actor) const
{
if (!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction ());
boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTake (ptr));
action->setSound(getUpSoundId(ptr));
return action;
return defaultItemActivate(ptr, actor);
}
std::string Lockpick::getScript (const MWWorld::Ptr& ptr) const

9
apps/openmw/mwclass/misc.cpp
Unescape Escape View File

@ -77,14 +77,7 @@ namespace MWClass
boost::shared_ptr<MWWorld::Action> Miscellaneous::activate (const MWWorld::Ptr& ptr,
const MWWorld::Ptr& actor) const
{
if (!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction ());
boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTake (ptr));
action->setSound(getUpSoundId(ptr));
return action;
return defaultItemActivate(ptr, actor);
}
std::string Miscellaneous::getScript (const MWWorld::Ptr& ptr) const

19
apps/openmw/mwclass/npc.cpp
Unescape Escape View File

@ -23,6 +23,7 @@
#include "../mwworld/ptr.hpp"
#include "../mwworld/actiontalk.hpp"
#include "../mwworld/actionopen.hpp"
#include "../mwworld/failedaction.hpp"
#include "../mwworld/inventorystore.hpp"
#include "../mwworld/customdata.hpp"
#include "../mwworld/physicssystem.hpp"
@ -562,12 +563,18 @@ namespace MWClass
boost::shared_ptr<MWWorld::Action> Npc::activate (const MWWorld::Ptr& ptr,
const MWWorld::Ptr& actor) const
{
if (MWWorld::Class::get (ptr).getCreatureStats (ptr).isDead())
return boost::shared_ptr<MWWorld::Action> (new MWWorld::ActionOpen(ptr, true));
else if (MWWorld::Class::get(actor).getStance(actor, MWWorld::Class::Sneak))
return boost::shared_ptr<MWWorld::Action> (new MWWorld::ActionOpen(ptr)); // stealing
else
return boost::shared_ptr<MWWorld::Action> (new MWWorld::ActionTalk (ptr));
if(get(actor).isNpc() && get(actor).getNpcStats(actor).isWerewolf())
{
boost::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
// FIXME: Randomize using all WolfNPC* sound records
action->setSound("WolfNPC1");
return action;
}
if(getCreatureStats(ptr).isDead())
return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr, true));
if(get(actor).getStance(actor, MWWorld::Class::Sneak))
return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr)); // stealing
return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionTalk(ptr));
}
MWWorld::ContainerStore& Npc::getContainerStore (const MWWorld::Ptr& ptr)

7
apps/openmw/mwclass/npc.hpp
Unescape Escape View File

@ -144,8 +144,11 @@ namespace MWClass
virtual std::string getModel(const MWWorld::Ptr &ptr) const;
virtual bool
isActor() const {
virtual bool isActor() const {
return true;
}
virtual bool isNpc() const {
return true;
}
};

10
apps/openmw/mwclass/potion.cpp
Unescape Escape View File

@ -63,15 +63,7 @@ namespace MWClass
boost::shared_ptr<MWWorld::Action> Potion::activate (const MWWorld::Ptr& ptr,
const MWWorld::Ptr& actor) const
{
if (!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction ());
boost::shared_ptr<MWWorld::Action> action(
new MWWorld::ActionTake (ptr));
action->setSound (getUpSoundId(ptr));
return action;
return defaultItemActivate(ptr, actor);
}
std::string Potion::getScript (const MWWorld::Ptr& ptr) const

9
apps/openmw/mwclass/probe.cpp
Unescape Escape View File

@ -60,14 +60,7 @@ namespace MWClass
boost::shared_ptr<MWWorld::Action> Probe::activate (const MWWorld::Ptr& ptr,
const MWWorld::Ptr& actor) const
{
if (!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction ());
boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTake (ptr));
action->setSound(getUpSoundId(ptr));
return action;
return defaultItemActivate(ptr, actor);
}
std::string Probe::getScript (const MWWorld::Ptr& ptr) const

9
apps/openmw/mwclass/repair.cpp
Unescape Escape View File

@ -60,14 +60,7 @@ namespace MWClass
boost::shared_ptr<MWWorld::Action> Repair::activate (const MWWorld::Ptr& ptr,
const MWWorld::Ptr& actor) const
{
if (!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction ());
boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTake (ptr));
action->setSound(getUpSoundId(ptr));
return action;
return defaultItemActivate(ptr, actor);
}
std::string Repair::getScript (const MWWorld::Ptr& ptr) const

9
apps/openmw/mwclass/weapon.cpp
Unescape Escape View File

@ -68,14 +68,7 @@ namespace MWClass
boost::shared_ptr<MWWorld::Action> Weapon::activate (const MWWorld::Ptr& ptr,
const MWWorld::Ptr& actor) const
{
if (!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction ());
boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTake (ptr));
action->setSound(getUpSoundId(ptr));
return action;
return defaultItemActivate(ptr, actor);
}
bool Weapon::hasItemHealth (const MWWorld::Ptr& ptr) const

26
apps/openmw/mwworld/class.cpp
Unescape Escape View File

@ -7,13 +7,20 @@
#include <components/esm/defs.hpp>
#include "../mwbase/environment.hpp"
#include "../mwbase/windowmanager.hpp"
#include "ptr.hpp"
#include "refdata.hpp"
#include "nullaction.hpp"
#include "failedaction.hpp"
#include "actiontake.hpp"
#include "containerstore.hpp"
#include "../mwgui/tooltips.hpp"
#include "../mwmechanics/creaturestats.hpp"
#include "../mwmechanics/npcstats.hpp"
#include "../mwmechanics/magiceffects.hpp"
namespace MWWorld
@ -304,6 +311,25 @@ namespace MWWorld
{
}
boost::shared_ptr<Action> Class::defaultItemActivate(const Ptr &ptr, const Ptr &actor) const
{
if(!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
return boost::shared_ptr<Action>(new NullAction());
if(get(actor).isNpc() && get(actor).getNpcStats(actor).isWerewolf())
{
boost::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction("#{sWerewolfRefusal}"));
// FIXME: Randomize using all WolfItem* sound records
action->setSound("WolfItem1");
return action;
}
boost::shared_ptr<MWWorld::Action> action(new ActionTake(ptr));
action->setSound(getUpSoundId(ptr));
return action;
}
MWWorld::Ptr
Class::copyToCellImpl(const Ptr &ptr, CellStore &cell) const
{

12
apps/openmw/mwworld/class.hpp
Unescape Escape View File

@ -57,6 +57,9 @@ namespace MWWorld
Class();
boost::shared_ptr<Action> defaultItemActivate(const Ptr &ptr, const Ptr &actor) const;
///< Generate default action for activating inventory items
virtual Ptr copyToCellImpl(const Ptr &ptr, CellStore &cell) const;
public:
@ -285,9 +288,12 @@ namespace MWWorld
virtual Ptr
copyToCell(const Ptr &ptr, CellStore &cell, const ESM::Position &pos) const;
virtual bool
isActor() const {
virtual bool isActor() const {
return false;
}
virtual bool isNpc() const {
return false;
}
};

12
apps/openmw/mwworld/failedaction.cpp
Unescape Escape View File

@ -7,15 +7,13 @@
namespace MWWorld
{
FailedAction::FailedAction (const std::string& msg) : Action (false), message(msg)
FailedAction::FailedAction(const std::string &msg)
: Action(false), mMessage(msg)
{ }
void FailedAction::executeImp (const Ptr& actor)
void FailedAction::executeImp(const Ptr &actor)
{
if ( actor.getRefData().getHandle()=="player" && !(message.empty()))
{
MWBase::Environment::get().getWindowManager() ->messageBox(message);
}
if(actor.getRefData().getHandle() == "player" && !mMessage.empty())
MWBase::Environment::get().getWindowManager()->messageBox(mMessage);
}
}

10
apps/openmw/mwworld/failedaction.hpp
Unescape Escape View File

@ -8,12 +8,12 @@ namespace MWWorld
{
class FailedAction : public Action
{
std::string message;
virtual void executeImp (const Ptr& actor);
std::string mMessage;
public:
FailedAction (const std::string& message = std::string());
virtual void executeImp(const Ptr &actor);
public:
FailedAction(const std::string &message = std::string());
};
}

Write Preview
Loading…
Cancel
Save