From 2961f0d8109bb47d5ce3434988b0dcc97637f9b1 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 16 Sep 2018 20:47:51 +0400
Subject: [PATCH] Allow to use the %Name for creatures (bug #4644)

---
 CHANGELOG.md                                |  1 +
 apps/openmw/mwscript/interpretercontext.cpp | 13 ++++++++++---
 apps/openmw/mwscript/interpretercontext.hpp |  2 +-
 components/interpreter/context.hpp          |  2 +-
 components/interpreter/defines.cpp          |  2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bea04fcb8..f37c5c4c26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -120,6 +120,7 @@
     Bug #4622: Recharging enchanted items with Soul Gems does not award experience if it fails
     Bug #4628: NPC record reputation, disposition and faction rank should have unsigned char type
     Bug #4633: Sneaking stance affects speed even if the actor is not able to crouch
+    Bug #4644: %Name should be available for all actors, not just for NPCs
     Feature #912: Editor: Add missing icons to UniversalId tables
     Feature #1645: Casting effects from objects
     Feature #2606: Editor: Implemented (optional) case sensitive global search
diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index f4e729da18..07b7a3bffd 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -288,10 +288,17 @@ namespace MWScript
         return "None";
     }
 
-    std::string InterpreterContext::getNPCName() const
+    std::string InterpreterContext::getActorName() const
     {
-        ESM::NPC npc = *getReferenceImp().get<ESM::NPC>()->mBase;
-        return npc.mName;
+        const MWWorld::Ptr& ptr = getReferenceImp();
+        if (ptr.getClass().isNpc())
+        {
+            const ESM::NPC* npc = ptr.get<ESM::NPC>()->mBase;
+            return npc->mName;
+        }
+
+        const ESM::Creature* creature = ptr.get<ESM::Creature>()->mBase;
+        return creature->mName;
     }
 
     std::string InterpreterContext::getNPCRace() const
diff --git a/apps/openmw/mwscript/interpretercontext.hpp b/apps/openmw/mwscript/interpretercontext.hpp
index ac8e1833b4..5f1f4f7ab8 100644
--- a/apps/openmw/mwscript/interpretercontext.hpp
+++ b/apps/openmw/mwscript/interpretercontext.hpp
@@ -93,7 +93,7 @@ namespace MWScript
 
             virtual std::string getActionBinding(const std::string& action) const;
 
-            virtual std::string getNPCName() const;
+            virtual std::string getActorName() const;
 
             virtual std::string getNPCRace() const;
 
diff --git a/components/interpreter/context.hpp b/components/interpreter/context.hpp
index 881687366b..4c320879e6 100644
--- a/components/interpreter/context.hpp
+++ b/components/interpreter/context.hpp
@@ -55,7 +55,7 @@ namespace Interpreter
 
             virtual std::string getActionBinding(const std::string& action) const = 0;
 
-            virtual std::string getNPCName() const = 0;
+            virtual std::string getActorName() const = 0;
 
             virtual std::string getNPCRace() const = 0;
 
diff --git a/components/interpreter/defines.cpp b/components/interpreter/defines.cpp
index 3c6226d9ce..0ceed80d53 100644
--- a/components/interpreter/defines.cpp
+++ b/components/interpreter/defines.cpp
@@ -138,7 +138,7 @@ namespace Interpreter{
                             retval << context.getNPCRace();
                         }
                         else if((found = check(temp, "name", &i, &start))){
-                            retval << context.getNPCName();
+                            retval << context.getActorName();
                         }
                     }
                     else { // In messagebox or book, not dialogue