From ed3641b21445f26de214cd2ea7a64d50d98b9ddc Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 27 Oct 2012 13:33:54 +0200
Subject: [PATCH] Issue #68: check for essential actors

---
 apps/openmw/mwclass/creature.cpp   | 8 ++++++++
 apps/openmw/mwclass/creature.hpp   | 3 +++
 apps/openmw/mwclass/npc.cpp        | 8 ++++++++
 apps/openmw/mwclass/npc.hpp        | 3 +++
 apps/openmw/mwmechanics/actors.cpp | 4 ++++
 apps/openmw/mwworld/class.cpp      | 5 +++++
 apps/openmw/mwworld/class.hpp      | 5 +++++
 7 files changed, 36 insertions(+)

diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 0fb9daf19..e007c50ab 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -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);
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index 4de877b31..a158fa743 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -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;
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index bcde31b26..ef3946efe 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -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);
diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index edb6ca40f..20c2da4b1 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -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;
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 1c9fefa16..f3b6b1616 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -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
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 5267e368d..8c639a874 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -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);
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 3c3b0e34b..4662cbab6 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -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.