[[ Bug ]] Resolve behaviors after loading auxiliary stacks

montegoulding · montegoulding · commit 7b7246e960f9 · 2017-12-18T16:52:10.000+11:00
This patch ensures that the behaviors of the mainstack of a stndalone
are resolved after all the stacks are loaded from the auxiliary stacks.
This was already the case for mobile, however, for some reason it was
`#ifdef`'d out for other platforms.
diff --git a/engine/src/dispatch.cpp b/engine/src/dispatch.cpp
@@ -522,16 +522,10 @@ IO_stat MCDispatch::readstartupstack(IO_handle stream, MCStack*& r_stack)
     // crash when searching substacks.
     stacks = t_stack;
     
-#ifndef _MOBILE
-	// Make sure parent script references are up to date.
-	if (s_loaded_parent_script_reference)
-		t_stack -> resolveparentscripts();
-#else
 	// Mark the stack as needed parentscript resolution. This is done after
 	// aux stacks have been loaded.
 	if (s_loaded_parent_script_reference)
 		t_stack -> setextendedstate(True, ECS_USES_PARENTSCRIPTS);
-#endif
     
     r_stack = t_stack;
 	return IO_NORMAL;
diff --git a/engine/src/mode_standalone.cpp b/engine/src/mode_standalone.cpp
@@ -930,6 +930,11 @@ IO_stat MCDispatch::startup(void)
 	
 	// Now open the main stack.
 	t_mainstack-> extraopen(false);
+    
+    // Resolve parent scripts *after* we've loaded aux stacks.
+    if (t_mainstack -> getextendedstate(ECS_USES_PARENTSCRIPTS))
+        t_mainstack -> resolveparentscripts();
+    
 	send_startup_message();
 	if (!MCquit)
 		t_mainstack -> open();
