From d1e0a101366a0eb82b2e58dce1fc094c95b27eca Mon Sep 17 00:00:00 2001
From: Capostrophic <alexdobrohotov@yandex.ru>
Date: Sun, 6 Jan 2019 21:03:19 +0300
Subject: [PATCH 1/2] Make sure AI data is initialized when loading actor
 records

---
 components/esm/loadcrea.cpp | 2 +-
 components/esm/loadnpc.cpp  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/esm/loadcrea.cpp b/components/esm/loadcrea.cpp
index 83315a5b8f..f04439041d 100644
--- a/components/esm/loadcrea.cpp
+++ b/components/esm/loadcrea.cpp
@@ -23,6 +23,7 @@ namespace ESM {
 
         mScale = 1.f;
         mHasAI = false;
+        mAiData.blank();
 
         bool hasName = false;
         bool hasNpdt = false;
@@ -160,7 +161,6 @@ namespace ESM {
         mSpells.mList.clear();
         mHasAI = false;
         mAiData.blank();
-        mAiData.mServices = 0;
         mAiPackage.mList.clear();
         mTransport.mList.clear();
     }
diff --git a/components/esm/loadnpc.cpp b/components/esm/loadnpc.cpp
index dd34934ad5..6e7ba66c52 100644
--- a/components/esm/loadnpc.cpp
+++ b/components/esm/loadnpc.cpp
@@ -18,6 +18,7 @@ namespace ESM
         mInventory.mList.clear();
         mTransport.mList.clear();
         mAiPackage.mList.clear();
+        mAiData.blank();
         mHasAI = false;
 
         bool hasName = false;

From 92d7f21926cee660dfaa05ceb4b93c93c0994ed6 Mon Sep 17 00:00:00 2001
From: Capostrophic <alexdobrohotov@yandex.ru>
Date: Sun, 6 Jan 2019 21:04:24 +0300
Subject: [PATCH 2/2] Don't interrupt compilation when spell/effect functions
 are used for non-actors

---
 CHANGELOG.md                             |  1 +
 apps/openmw/mwscript/miscextensions.cpp  | 12 ++++++++++++
 apps/openmw/mwscript/statsextensions.cpp |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0da3ba67d9..41b57bf288 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
     Bug #4746: Non-solid player can't run or sneak
     Bug #4750: Sneaking doesn't work in first person view if the player is in attack ready state
     Bug #4768: Fallback numerical value recovery chokes on invalid arguments
+    Bug #4778: Interiors of Illusion puzzle in Sotha Sil Expanded mod is broken
     Feature #2229: Improve pathfinding AI
     Feature #3442: Default values for fallbacks from ini file
     Feature #3610: Option to invert X axis
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 0cf2fc464b..d3b49239ce 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -431,6 +431,12 @@ namespace MWScript
                     std::string effect = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
+                    if (!ptr.getClass().isActor())
+                    {
+                        runtime.push(0);
+                        return;
+                    }
+
                     char *end;
                     long key = strtol(effect.c_str(), &end, 10);
                     if(key < 0 || key > 32767 || *end != '\0')
@@ -659,6 +665,12 @@ namespace MWScript
                     std::string id = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
+                    if (!ptr.getClass().isActor())
+                    {
+                        runtime.push(0);
+                        return;
+                    }
+
                     const MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
                     runtime.push(stats.getActiveSpells().isSpellActive(id) || stats.getSpells().isSpellActive(id));
                 }
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index 53316c44c9..10d1252b91 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -536,7 +536,7 @@ namespace MWScript
 
                     Interpreter::Type_Integer value = 0;
 
-                    if (ptr.getClass().getCreatureStats(ptr).getSpells().hasSpell(id))
+                    if (ptr.getClass().isActor() && ptr.getClass().getCreatureStats(ptr).getSpells().hasSpell(id))
                         value = 1;
 
                     runtime.push (value);