Global before/after scope fixed

wghost · Dec 17, 2014 · 3c469d3 · 3c469d3
1 parent 4eda72c
commit 3c469d3
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/ModScript.cpp b/ModScript.cpp
@@ -659,11 +659,11 @@ size_t ModScript::GetDiff(size_t DataSize)
 
 bool ModScript::CheckMoveResize(size_t DataSize, bool FitScope)
 {
+    size_t ScopeSize = ScriptState.MaxOffset - ScriptState.Offset - ScriptState.RelOffset + 1;
     if (ScriptState.Scope == UPKScope::Object)
     {
         bool NeedMoveResize = false;
         size_t ObjSize = ScriptState.Package.GetExportEntry(ScriptState.ObjIdx).SerialSize;
-        size_t ScopeSize = ScriptState.MaxOffset - ScriptState.Offset - ScriptState.RelOffset + 1;
         if (FitScope && ScopeSize != DataSize)
         {
             if (ScriptState.Behavior != "KEEP")
@@ -673,7 +673,7 @@ bool ModScript::CheckMoveResize(size_t DataSize, bool FitScope)
             }
             else
             {
-                *ErrorMessages << "Data chunk too large for current scope!\n";
+                *ErrorMessages << "Data chunk does not fit current scope!\n";
                 return SetBad();
             }
         }
@@ -691,6 +691,11 @@ bool ModScript::CheckMoveResize(size_t DataSize, bool FitScope)
             return DoResize(ObjSize);
         }
     }
+    else if (FitScope && ScopeSize != DataSize)
+    {
+        *ErrorMessages << "Data chunk does not fit current scope!\n";
+        return SetBad();
+    }
     if (!IsInsideScope(DataSize))
     {
         *ErrorMessages << "Data chunk too large for current scope!\n";