mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-23 08:39:41 +00:00
Code Issues Releases Wiki Activity

Merged pull request #1924

Browse source
This commit is contained in:
Marc Zinnschlag 2018-09-17 11:58:24 +02:00
commit deb779af35
5 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -120,6 +120,7 @@
Bug #4622: Recharging enchanted items with Soul Gems does not award experience if it fails 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 #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 #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 #912: Editor: Add missing icons to UniversalId tables
Feature #1645: Casting effects from objects Feature #1645: Casting effects from objects
Feature #2606: Editor: Implemented (optional) case sensitive global search Feature #2606: Editor: Implemented (optional) case sensitive global search

13
apps/openmw/mwscript/interpretercontext.cpp
View file

@ -288,10 +288,17 @@ namespace MWScript
return "None"; return "None";
} }
std::string InterpreterContext::getNPCName() const std::string InterpreterContext::getActorName() const
{ {
ESM::NPC npc = *getReferenceImp().get<ESM::NPC>()->mBase; const MWWorld::Ptr& ptr = getReferenceImp();
return npc.mName; 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 std::string InterpreterContext::getNPCRace() const

2
apps/openmw/mwscript/interpretercontext.hpp
View file

@ -93,7 +93,7 @@ namespace MWScript
virtual std::string getActionBinding(const std::string& action) const; virtual std::string getActionBinding(const std::string& action) const;
virtual std::string getNPCName() const; virtual std::string getActorName() const;
virtual std::string getNPCRace() const; virtual std::string getNPCRace() const;

2
components/interpreter/context.hpp
View file

@ -55,7 +55,7 @@ namespace Interpreter
virtual std::string getActionBinding(const std::string& action) const = 0; 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; virtual std::string getNPCRace() const = 0;

2
components/interpreter/defines.cpp
View file

@ -138,7 +138,7 @@ namespace Interpreter{
retval << context.getNPCRace(); retval << context.getNPCRace();
} }
else if((found = check(temp, "name", &i, &start))){ else if((found = check(temp, "name", &i, &start))){
retval << context.getNPCName(); retval << context.getActorName();
} }
} }
else { // In messagebox or book, not dialogue else { // In messagebox or book, not dialogue