Add isActorSelectable

References #38
scemino · Oct 23, 2019 · aaad9e1 · aaad9e1
1 parent 197dc69
commit aaad9e1
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/include/Engine.h b/include/Engine.h
@@ -146,6 +146,7 @@ class Engine : public NonCopyable
     void actorSlotSelectable(Actor *pActor, bool selectable);
     void actorSlotSelectable(int index, bool selectable);
     void setActorSlotSelectable(ActorSlotSelectableMode mode);
+    bool isActorSelectable(Actor* pActor) const;
     void setUseFlag(UseFlag flag, Entity *object);
     void flashSelectableActor(bool on);
 

diff --git a/src/Engine.cpp b/src/Engine.cpp
@@ -1361,6 +1361,16 @@ void Engine::actorSlotSelectable(int index, bool selectable)
     _pImpl->_actorsIconSlots.at(index - 1).selectable = selectable;
 }
 
+bool Engine::isActorSelectable(Actor* pActor) const
+{
+    for (auto &&slot : _pImpl->_actorsIconSlots)
+    {
+        if(slot.pActor == pActor)
+            return slot.selectable;
+    }
+    return false;
+}
+
 void Engine::setActorSlotSelectable(ActorSlotSelectableMode mode) { _pImpl->_actorIcons.setMode(mode); }
 
 void Engine::setUseFlag(UseFlag flag, Entity *object)

diff --git a/src/Scripting/_ActorPack.h b/src/Scripting/_ActorPack.h
@@ -56,6 +56,7 @@ class _ActorPack : public Pack
         engine.registerGlobalFunction(isActor, "isActor");
         engine.registerGlobalFunction(isActorOnScreen, "isActorOnScreen");
         engine.registerGlobalFunction(isActor, "is_actor");
+        engine.registerGlobalFunction(isActorSelectable, "isActorSelectable");
         engine.registerGlobalFunction(masterActorArray, "masterActorArray");
         engine.registerGlobalFunction(mumbleLine, "mumbleLine");
         engine.registerGlobalFunction(sayLine, "sayLine");
@@ -1017,6 +1018,14 @@ class _ActorPack : public Pack
         return 1;
     }
 
+    static SQInteger isActorSelectable(HSQUIRRELVM v)
+    {
+        auto actor = ScriptEngine::getActor(v, 2);
+        bool isSelectable = g_pEngine->isActorSelectable(actor);
+        sq_pushbool(v, isSelectable ? SQTrue : SQFalse);
+        return 1;
+    }
+
     static SQInteger isActorOnScreen(HSQUIRRELVM v)
     {
         auto entity = ScriptEngine::getEntity(v, 2);