Check if the local was not found, just for sure

7 years ago · 97d8cc0efe
parent 7dff8d8fe2
commit 97d8cc0efe
1 changed files with 4 additions and 2 deletions
--- a/apps/openmw/mwscript/locals.cpp
+++ b/apps/openmw/mwscript/locals.cpp
@ -240,6 +240,10 @@ namespace MWScript
                    char type =  declarations.getType (iter->first);
                    int index2 = declarations.getIndex (iter->first);

+                    // silently ignore locals that don't exist anymore
+                    if (type == ' ' || index2 == -1)
+                        continue;
+
                    try
                    {
                        switch (type)
@ -247,8 +251,6 @@ namespace MWScript
                            case 's': mShorts.at (index2) = iter->second.getInteger(); break;
                            case 'l': mLongs.at (index2) = iter->second.getInteger(); break;
                            case 'f': mFloats.at (index2) = iter->second.getFloat(); break;
-
-                            // silently ignore locals that don't exist anymore
                        }
                    }
                    catch (...)