XEEN: Fix Swords scripts using cmdReturn instead of cmdExit

scummvm · Apr 16, 2018 · c92561c · c92561c
1 parent 77c06fe
commit c92561c
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
@@ -1048,11 +1048,16 @@ bool Scripts::cmdCallEvent(ParamsIterator &params) {
 }
 
 bool Scripts::cmdReturn(ParamsIterator &params) {
-	StackEntry se = _stack.pop();
-	_currentPos = se;
-	_lineNum = se.line;
+	if (_stack.empty()) {
+		// WORKAROUND: Some scripts in Swords of Xeen use cmdReturn as a substitute for cmdExit
+		return cmdExit(params);
+	} else {
+		StackEntry se = _stack.pop();
+		_currentPos = se;
+		_lineNum = se.line;
 
-	return true;
+		return true;
+	}
 }
 
 bool Scripts::cmdSetVar(ParamsIterator &params) {