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

Issue #68: check for essential actors

Browse source
This commit is contained in:
Marc Zinnschlag 2012-10-27 13:33:54 +02:00
parent 453f347ee8
commit ed3641b214
7 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw/mwclass/creature.cpp
View file

@ -149,6 +149,14 @@ namespace MWClass
return ref->base->mScript;
}
bool Creature::isEssential (const MWWorld::Ptr& ptr) const
{
MWWorld::LiveCellRef<ESM::Creature> *ref =
ptr.get<ESM::Creature>();
return ref->base->mFlags & ESM::Creature::Essential;
}
void Creature::registerSelf()
{
boost::shared_ptr<Class> instance (new Creature);

3
apps/openmw/mwclass/creature.hpp
View file

@ -56,6 +56,9 @@ namespace MWClass
///< Returns total weight of objects inside this object (including modifications from magic
/// effects). Throws an exception, if the object can't hold other objects.
virtual bool isEssential (const MWWorld::Ptr& ptr) const;
///< Is \a ptr essential? (i.e. may losing \a ptr make the game unwinnable)
static void registerSelf();
virtual std::string getModel(const MWWorld::Ptr &ptr) const;

8
apps/openmw/mwclass/npc.cpp
View file

@ -315,7 +315,15 @@ namespace MWClass
return vector;
}
bool Npc::isEssential (const MWWorld::Ptr& ptr) const
{
MWWorld::LiveCellRef<ESM::NPC> *ref =
ptr.get<ESM::NPC>();
return ref->base->mFlags & ESM::NPC::Essential;
}
void Npc::registerSelf()
{
boost::shared_ptr<Class> instance (new Npc);

3
apps/openmw/mwclass/npc.hpp
View file

@ -90,6 +90,9 @@ namespace MWClass
virtual void adjustRotation(const MWWorld::Ptr& ptr,float& x,float& y,float& z) const;
virtual bool isEssential (const MWWorld::Ptr& ptr) const;
///< Is \a ptr essential? (i.e. may losing \a ptr make the game unwinnable)
static void registerSelf();
virtual std::string getModel(const MWWorld::Ptr &ptr) const;

4
apps/openmw/mwmechanics/actors.cpp
View file

@ -238,6 +238,10 @@ namespace MWMechanics
MWBase::Environment::get().getWorld()->playAnimationGroup (*iter, "death1", 0);
if (MWWorld::Class::get (*iter).isEssential (*iter))
MWBase::Environment::get().getWindowManager()->messageBox (
"#{sKilledEssential}", std::vector<std::string>());
mActors.erase (iter++);
}
else

5
apps/openmw/mwworld/class.cpp
View file

@ -157,6 +157,11 @@ namespace MWWorld
throw std::runtime_error ("encumbrance not supported by class");
}
bool Class::isEssential (const MWWorld::Ptr& ptr) const
{
return false;
}
const Class& Class::get (const std::string& key)
{
std::map<std::string, boost::shared_ptr<Class> >::const_iterator iter = sClasses.find (key);

5
apps/openmw/mwworld/class.hpp
View file

@ -186,6 +186,11 @@ namespace MWWorld
///
/// (default implementations: throws an exception)
virtual bool isEssential (const MWWorld::Ptr& ptr) const;
///< Is \a ptr essential? (i.e. may losing \a ptr make the game unwinnable)
///
/// (default implementation: return false)
static const Class& get (const std::string& key);
///< If there is no class for this \a key, an exception is thrown.