From 7a313f24abc0362955ab90dccd4b60dfc4ff029b Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Thu, 5 Aug 2010 15:40:03 +0200
Subject: [PATCH] integrated activation into script system
---
apps/openmw/engine.cpp | 15 ++++++++++++++-
apps/openmw/mwclass/activator.cpp | 8 ++++++++
apps/openmw/mwclass/activator.hpp | 3 +++
apps/openmw/mwclass/apparatus.cpp | 8 ++++++++
apps/openmw/mwclass/apparatus.hpp | 3 +++
apps/openmw/mwclass/armor.cpp | 8 ++++++++
apps/openmw/mwclass/armor.hpp | 3 +++
apps/openmw/mwclass/book.cpp | 8 ++++++++
apps/openmw/mwclass/book.hpp | 3 +++
apps/openmw/mwclass/clothing.cpp | 8 ++++++++
apps/openmw/mwclass/clothing.hpp | 3 +++
apps/openmw/mwclass/container.cpp | 8 ++++++++
apps/openmw/mwclass/container.hpp | 3 +++
apps/openmw/mwclass/creature.cpp | 8 ++++++++
apps/openmw/mwclass/creature.hpp | 3 +++
apps/openmw/mwclass/door.cpp | 8 ++++++++
apps/openmw/mwclass/door.hpp | 3 +++
apps/openmw/mwclass/ingredient.cpp | 8 ++++++++
apps/openmw/mwclass/ingredient.hpp | 3 +++
apps/openmw/mwclass/light.cpp | 8 ++++++++
apps/openmw/mwclass/light.hpp | 3 +++
apps/openmw/mwclass/lockpick.cpp | 8 ++++++++
apps/openmw/mwclass/lockpick.hpp | 3 +++
apps/openmw/mwclass/misc.cpp | 8 ++++++++
apps/openmw/mwclass/misc.hpp | 3 +++
apps/openmw/mwclass/npc.cpp | 8 ++++++++
apps/openmw/mwclass/npc.hpp | 3 +++
apps/openmw/mwclass/potion.cpp | 8 ++++++++
apps/openmw/mwclass/potion.hpp | 3 +++
apps/openmw/mwclass/probe.cpp | 8 ++++++++
apps/openmw/mwclass/probe.hpp | 3 +++
apps/openmw/mwclass/repair.cpp | 8 ++++++++
apps/openmw/mwclass/repair.hpp | 3 +++
apps/openmw/mwclass/weapon.cpp | 8 ++++++++
apps/openmw/mwclass/weapon.hpp | 3 +++
apps/openmw/mwworld/class.cpp | 5 +++++
apps/openmw/mwworld/class.hpp | 4 ++++
37 files changed, 210 insertions(+), 1 deletion(-)
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 4e7b3eef7..badb19629 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -279,9 +279,22 @@ void OMW::Engine::activate()
if (ptr.isEmpty())
return;
+ MWScript::InterpreterContext interpreterContext (mEnvironment,
+ &ptr.getRefData().getLocals(), ptr);
+
boost::shared_ptr<MWWorld::Action> action =
MWWorld::Class::get (ptr).activate (ptr, mEnvironment.mWorld->getPlayerPos().getPlayer(),
mEnvironment);
- action->execute (mEnvironment);
+ interpreterContext.activate (ptr, action);
+
+ std::string script = MWWorld::Class::get (ptr).getScript (ptr);
+
+ if (!script.empty())
+ mScriptManager->run (script, interpreterContext);
+
+ if (!interpreterContext.hasActivationBeenHandled())
+ {
+ interpreterContext.executeActivation();
+ }
}
diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index ff2d559f4..3cdc1f850 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -17,6 +17,14 @@ namespace MWClass
return ref->base->name;
}
+ std::string Activator::getScript (const MWWorld::Ptr& ptr) const
+ {
+ ESMS::LiveCellRef<ESM::Activator, MWWorld::RefData> *ref =
+ ptr.get<ESM::Activator>();
+
+ return ref->base->script;
+ }
+
void Activator::registerSelf()
{
boost::shared_ptr<Class> instance (new Activator);
diff --git a/apps/openmw/mwclass/activator.hpp b/apps/openmw/mwclass/activator.hpp
index 5639117b7..66821a7c5 100644
--- a/apps/openmw/mwclass/activator.hpp
+++ b/apps/openmw/mwclass/activator.hpp
@@ -13,6 +13,9 @@ namespace MWClass
///< \return name (the one that is to be presented to the user; not the internal one);
/// can return an empty string.
+ virtual std::string getScript (const MWWorld::Ptr& ptr) const;
+ ///< Return name of the script attached to ptr
+
static void registerSelf();
};
}
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index 1a936e76b..066eacd3f 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -17,6 +17,14 @@ namespace MWClass
return ref->base->name;
}
+ std::string Apparatus::getScript (const MWWorld::Ptr& ptr) const
+ {
+ ESMS::LiveCellRef<ESM::Apparatus, MWWorld::RefData> *ref =
+ ptr.get<ESM::Apparatus>();
+
+ return ref->base->script;
+ }
+
void Apparatus::registerSelf()
{
boost::shared_ptr<Class> instance (new Apparatus);
diff --git a/apps/openmw/mwclass/apparatus.hpp b/apps/openmw/mwclass/apparatus.hpp
index 96c838e8d..7b3ccff6a 100644
--- a/apps/openmw/mwclass/apparatus.hpp
+++ b/apps/openmw/mwclass/apparatus.hpp
@@ -13,6 +13,9 @@ namespace MWClass
///< \return name (the one that is to be presented to the user; not the internal one);
/// can return an empty string.
+ virtual std::string getScript (const MWWorld::Ptr& ptr) const;
+ ///< Return name of the script attached to ptr
+
static void registerSelf();
};
}
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index 1a339c703..786868c81 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -30,6 +30,14 @@ namespace MWClass
return ref->base->data.health;
}
+ std::string Armor::getScript (const MWWorld::Ptr& ptr) const
+ {
+ ESMS::LiveCellRef<ESM::Armor, MWWorld::RefData> *ref =
+ ptr.get<ESM::Armor>();
+
+ return ref->base->script;
+ }
+
void Armor::registerSelf()
{
boost::shared_ptr<Class> instance (new Armor);
diff --git a/apps/openmw/mwclass/armor.hpp b/apps/openmw/mwclass/armor.hpp
index 4a6cd2f75..ebae75a9f 100644
--- a/apps/openmw/mwclass/armor.hpp
+++ b/apps/openmw/mwclass/armor.hpp
@@ -19,6 +19,9 @@ namespace MWClass
virtual int getItemMaxHealth (const MWWorld::Ptr& ptr) const;
///< Return item max health or throw an exception, if class does not have item health
+ virtual std::string getScript (const MWWorld::Ptr& ptr) const;
+ ///< Return name of the script attached to ptr
+
static void registerSelf();
};
}
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index d16269857..9c0a48409 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -17,6 +17,14 @@ namespace MWClass
return ref->base->name;
}
+ std::string Book::getScript (const MWWorld::Ptr& ptr) const
+ {
+ ESMS::LiveCellRef<ESM::Book, MWWorld::RefData> *ref =
+ ptr.get<ESM::Book>();
+
+ return ref->base->script;
+ }
+
void Book::registerSelf()
{
boost::shared_ptr<Class> instance (new Book);
diff --git a/apps/openmw/mwclass/book.hpp b/apps/openmw/mwclass/book.hpp
index b9a03f2e7..d45f569b5 100644
--- a/apps/openmw/mwclass/book.hpp
+++ b/apps/openmw/mwclass/book.hpp
@@ -13,6 +13,9 @@ namespace MWClass
///< \return name (the one that is to be presented to the user; not the internal one);
/// can return an empty string.
+ virtual std::string getScript (const MWWorld::Ptr& ptr) const;
+ ///< Return name of the script attached to ptr
+
static void registerSelf();
};
}
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index a728394d9..2c0d76fb3 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -17,6 +17,14 @@ namespace MWClass
return ref->base->name;
}
+ std::string Clothing::getScript (const MWWorld::Ptr& ptr) const
+ {
+ ESMS::LiveCellRef<ESM::Clothing, MWWorld::RefData> *ref =
+ ptr.get<ESM::Clothing>();
+
+ return ref->base->script;
+ }
+
void Clothing::registerSelf()
{
boost::shared_ptr<Class> instance (new Clothing);
diff --git a/apps/openmw/mwclass/clothing.hpp b/apps/openmw/mwclass/clothing.hpp
index 1b8dcf16d..09b66b92d 100644
--- a/apps/openmw/mwclass/clothing.hpp
+++ b/apps/openmw/mwclass/clothing.hpp
@@ -13,6 +13,9 @@ namespace MWClass
///< \return name (the one that is to be presented to the user; not the internal one);
/// can return an empty string.
+ virtual std::string getScript (const MWWorld::Ptr& ptr) const;
+ ///< Return name of the script attached to ptr
+
static void registerSelf();
};
}
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index a6df294e7..dd0fc729c 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -17,6 +17,14 @@ namespace MWClass
return ref->base->name;
}
+ std::string Container::getScript (const MWWorld::Ptr& ptr) const
+ {
+ ESMS::LiveCellRef<ESM::Container, MWWorld::RefData> *ref =
+ ptr.get<ESM::Container>();
+
+ return ref->base->script;
+ }
+
void Container::registerSelf()
{
boost::shared_ptr<Class> instance (new Container);
diff --git a/apps/openmw/mwclass/container.hpp b/apps/openmw/mwclass/container.hpp
index 0b907b2b7..959e6a634 100644
--- a/apps/openmw/mwclass/container.hpp
+++ b/apps/openmw/mwclass/container.hpp
@@ -13,6 +13,9 @@ namespace MWClass
///< \return name (the one that is to be presented to the user; not the internal one);
/// can return an empty string.
+ virtual std::string getScript (const MWWorld::Ptr& ptr) const;
+ ///< Return name of the script attached to ptr
+
static void registerSelf();
};
}
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 198c0e72f..e34f92fb4 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -44,6 +44,14 @@ namespace MWClass
return *ptr.getRefData().getCreatureStats();
}
+ std::string Creature::getScript (const MWWorld::Ptr& ptr) const
+ {
+ ESMS::LiveCellRef<ESM::Creature, MWWorld::RefData> *ref =
+ ptr.get<ESM::Creature>();
+
+ return ref->base->script;
+ }
+
void Creature::registerSelf()
{
boost::shared_ptr<Class> instance (new Creature);
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index 5056501c5..03333a50a 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -16,6 +16,9 @@ namespace MWClass
virtual MWMechanics::CreatureStats& getCreatureStats (const MWWorld::Ptr& ptr) const;
///< Return creature stats
+ virtual std::string getScript (const MWWorld::Ptr& ptr) const;
+ ///< Return name of the script attached to ptr
+
static void registerSelf();
};
}
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 24710fa4c..2c4bd3562 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -53,6 +53,14 @@ namespace MWClass
}
}
+ std::string Door::getScript (const MWWorld::Ptr& ptr) const
+ {
+ ESMS::LiveCellRef<ESM::Door, MWWorld::RefData> *ref =
+ ptr.get<ESM::Door>();
+
+ return ref->base->script;
+ }
+
void Door::registerSelf()
{
boost::shared_ptr<Class> instance (new Door);
diff --git a/apps/openmw/mwclass/door.hpp b/apps/openmw/mwclass/door.hpp
index 28d048633..fa3b6d657 100644
--- a/apps/openmw/mwclass/door.hpp
+++ b/apps/openmw/mwclass/door.hpp
@@ -17,6 +17,9 @@ namespace MWClass
const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const;
///< Generate action for activation
+ virtual std::string getScript (const MWWorld::Ptr& ptr) const;
+ ///< Return name of the script attached to ptr
+
static void registerSelf();
};
}
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index 6ae80c440..81d19b2fa 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -17,6 +17,14 @@ namespace MWClass
return ref->base->name;
}
+ std::string Ingredient::getScript (const MWWorld::Ptr& ptr) const
+ {
+ ESMS::LiveCellRef<ESM::Ingredient, MWWorld::RefData> *ref =
+ ptr.get<ESM::Ingredient>();
+
+ return ref->base->script;
+ }
+
void Ingredient::registerSelf()
{
boost::shared_ptr<Class> instance (new Ingredient);
diff --git a/apps/openmw/mwclass/ingredient.hpp b/apps/openmw/mwclass/ingredient.hpp
index eed520cb1..c2edd9484 100644
--- a/apps/openmw/mwclass/ingredient.hpp
+++ b/apps/openmw/mwclass/ingredient.hpp
@@ -13,6 +13,9 @@ namespace MWClass
///< \return name (the one that is to be presented to the user; not the internal one);
/// can return an empty string.
+ virtual std::string getScript (const MWWorld::Ptr& ptr) const;
+ ///< Return name of the script attached to ptr
+
static void registerSelf();
};
}
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index bf983259b..98e0b01b4 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -20,6 +20,14 @@ namespace MWClass
return ref->base->name;
}
+ std::string Light::getScript (const MWWorld::Ptr& ptr) const
+ {
+ ESMS::LiveCellRef<ESM::Light, MWWorld::RefData> *ref =
+ ptr.get<ESM::Light>();
+
+ return ref->base->script;
+ }
+
void Light::registerSelf()
{
boost::shared_ptr<Class> instance (new Light);
diff --git a/apps/openmw/mwclass/light.hpp b/apps/openmw/mwclass/light.hpp
index 8fa53aeaf..08c3ddf7c 100644
--- a/apps/openmw/mwclass/light.hpp
+++ b/apps/openmw/mwclass/light.hpp
@@ -13,6 +13,9 @@ namespace MWClass
///< \return name (the one that is to be presented to the user; not the internal one);
/// can return an empty string.
+ virtual std::string getScript (const MWWorld::Ptr& ptr) const;
+ ///< Return name of the script attached to ptr
+
static void registerSelf();
};
}
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index ee861c30b..ce57e0c99 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -17,6 +17,14 @@ namespace MWClass
return ref->base->name;
}
+ std::string Lockpick::getScript (const MWWorld::Ptr& ptr) const
+ {
+ ESMS::LiveCellRef<ESM::Tool, MWWorld::RefData> *ref =
+ ptr.get<ESM::Tool>();
+
+ return ref->base->script;
+ }
+
void Lockpick::registerSelf()
{
boost::shared_ptr<Class> instance (new Lockpick);
diff --git a/apps/openmw/mwclass/lockpick.hpp b/apps/openmw/mwclass/lockpick.hpp
index daff07f85..e009e9fdd 100644
--- a/apps/openmw/mwclass/lockpick.hpp
+++ b/apps/openmw/mwclass/lockpick.hpp
@@ -13,6 +13,9 @@ namespace MWClass
///< \return name (the one that is to be presented to the user; not the internal one);
/// can return an empty string.
+ virtual std::string getScript (const MWWorld::Ptr& ptr) const;
+ ///< Return name of the script attached to ptr
+
static void registerSelf();
};
}
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index eabb7ba7a..dda21aaa7 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -17,6 +17,14 @@ namespace MWClass
return ref->base->name;
}
+ std::string Misc::getScript (const MWWorld::Ptr& ptr) const
+ {
+ ESMS::LiveCellRef<ESM::Misc, MWWorld::RefData> *ref =
+ ptr.get<ESM::Misc>();
+
+ return ref->base->script;
+ }
+
void Misc::registerSelf()
{
boost::shared_ptr<Class> instance (new Misc);
diff --git a/apps/openmw/mwclass/misc.hpp b/apps/openmw/mwclass/misc.hpp
index d2f685d40..526235aa0 100644
--- a/apps/openmw/mwclass/misc.hpp
+++ b/apps/openmw/mwclass/misc.hpp
@@ -13,6 +13,9 @@ namespace MWClass
///< \return name (the one that is to be presented to the user; not the internal one);
/// can return an empty string.
+ virtual std::string getScript (const MWWorld::Ptr& ptr) const;
+ ///< Return name of the script attached to ptr
+
static void registerSelf();
};
}
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index dbb7f2a93..2887ad0b5 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -44,6 +44,14 @@ namespace MWClass
return *ptr.getRefData().getCreatureStats();
}
+ std::string Npc::getScript (const MWWorld::Ptr& ptr) const
+ {
+ ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> *ref =
+ ptr.get<ESM::NPC>();
+
+ return ref->base->script;
+ }
+
void Npc::registerSelf()
{
boost::shared_ptr<Class> instance (new Npc);
diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index 76c56de40..e0b828f61 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -16,6 +16,9 @@ namespace MWClass
virtual MWMechanics::CreatureStats& getCreatureStats (const MWWorld::Ptr& ptr) const;
///< Return creature stats
+ virtual std::string getScript (const MWWorld::Ptr& ptr) const;
+ ///< Return name of the script attached to ptr
+
static void registerSelf();
};
}
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index 75f2f6ccb..f8e9ee0a0 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -17,6 +17,14 @@ namespace MWClass
return ref->base->name;
}
+ std::string Potion::getScript (const MWWorld::Ptr& ptr) const
+ {
+ ESMS::LiveCellRef<ESM::Potion, MWWorld::RefData> *ref =
+ ptr.get<ESM::Potion>();
+
+ return ref->base->script;
+ }
+
void Potion::registerSelf()
{
boost::shared_ptr<Class> instance (new Potion);
diff --git a/apps/openmw/mwclass/potion.hpp b/apps/openmw/mwclass/potion.hpp
index 350aba156..c851d1b4e 100644
--- a/apps/openmw/mwclass/potion.hpp
+++ b/apps/openmw/mwclass/potion.hpp
@@ -13,6 +13,9 @@ namespace MWClass
///< \return name (the one that is to be presented to the user; not the internal one);
/// can return an empty string.
+ virtual std::string getScript (const MWWorld::Ptr& ptr) const;
+ ///< Return name of the script attached to ptr
+
static void registerSelf();
};
}
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index 65fbf47cb..3c22e4c7f 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -17,6 +17,14 @@ namespace MWClass
return ref->base->name;
}
+ std::string Probe::getScript (const MWWorld::Ptr& ptr) const
+ {
+ ESMS::LiveCellRef<ESM::Probe, MWWorld::RefData> *ref =
+ ptr.get<ESM::Probe>();
+
+ return ref->base->script;
+ }
+
void Probe::registerSelf()
{
boost::shared_ptr<Class> instance (new Probe);
diff --git a/apps/openmw/mwclass/probe.hpp b/apps/openmw/mwclass/probe.hpp
index 1a60f220a..84e93d1ce 100644
--- a/apps/openmw/mwclass/probe.hpp
+++ b/apps/openmw/mwclass/probe.hpp
@@ -13,6 +13,9 @@ namespace MWClass
///< \return name (the one that is to be presented to the user; not the internal one);
/// can return an empty string.
+ virtual std::string getScript (const MWWorld::Ptr& ptr) const;
+ ///< Return name of the script attached to ptr
+
static void registerSelf();
};
}
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index 722baebde..f22b8607a 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -17,6 +17,14 @@ namespace MWClass
return ref->base->name;
}
+ std::string Repair::getScript (const MWWorld::Ptr& ptr) const
+ {
+ ESMS::LiveCellRef<ESM::Repair, MWWorld::RefData> *ref =
+ ptr.get<ESM::Repair>();
+
+ return ref->base->script;
+ }
+
void Repair::registerSelf()
{
boost::shared_ptr<Class> instance (new Repair);
diff --git a/apps/openmw/mwclass/repair.hpp b/apps/openmw/mwclass/repair.hpp
index e7a9928ed..803e21d51 100644
--- a/apps/openmw/mwclass/repair.hpp
+++ b/apps/openmw/mwclass/repair.hpp
@@ -13,6 +13,9 @@ namespace MWClass
///< \return name (the one that is to be presented to the user; not the internal one);
/// can return an empty string.
+ virtual std::string getScript (const MWWorld::Ptr& ptr) const;
+ ///< Return name of the script attached to ptr
+
static void registerSelf();
};
}
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 5ca80bcb7..a7fce960c 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -30,6 +30,14 @@ namespace MWClass
return ref->base->data.health;
}
+ std::string Weapon::getScript (const MWWorld::Ptr& ptr) const
+ {
+ ESMS::LiveCellRef<ESM::Weapon, MWWorld::RefData> *ref =
+ ptr.get<ESM::Weapon>();
+
+ return ref->base->script;
+ }
+
void Weapon::registerSelf()
{
boost::shared_ptr<Class> instance (new Weapon);
diff --git a/apps/openmw/mwclass/weapon.hpp b/apps/openmw/mwclass/weapon.hpp
index 98e5930f8..01b6f8e13 100644
--- a/apps/openmw/mwclass/weapon.hpp
+++ b/apps/openmw/mwclass/weapon.hpp
@@ -19,6 +19,9 @@ namespace MWClass
virtual int getItemMaxHealth (const MWWorld::Ptr& ptr) const;
///< Return item max health or throw an exception, if class does not have item health
+ virtual std::string getScript (const MWWorld::Ptr& ptr) const;
+ ///< Return name of the script attached to ptr
+
static void registerSelf();
};
}
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 9cca8035e..267ff7294 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -41,6 +41,11 @@ namespace MWWorld
return boost::shared_ptr<Action> (new NullAction);
}
+ std::string Class::getScript (const Ptr& ptr) const
+ {
+ return "";
+ }
+
const Class& Class::get (const std::string& key)
{
std::map<std::string, boost::shared_ptr<Class> >::const_iterator iter = sClasses.find (key);
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 9535786e2..3f5722ce2 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -58,6 +58,10 @@ namespace MWWorld
///< Generate action for using via inventory menu (default implementation: return a
/// null action).
+ virtual std::string getScript (const Ptr& ptr) const;
+ ///< Return name of the script attached to ptr (default implementation: return an empty
+ /// string).
+
static const Class& get (const std::string& key);
///< If there is no class for this \a key, an exception is thrown.