[Scummvm-cvs-logs] SF.net SVN: scummvm:[50940] scummvm/trunk/engines/sci/console.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 50940
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50940&view=rev
Author:   m_kiewitz
Date:     2010-07-16 19:40:51 +0000 (Fri, 16 Jul 2010)

Log Message:
-----------
SCI: fix console commands so that console gets detached correctly

Modified Paths:
--------------
    scummvm/trunk/engines/sci/console.cpp

Modified: scummvm/trunk/engines/sci/console.cpp
===================================================================
--- scummvm/trunk/engines/sci/console.cpp	2010-07-16 19:33:28 UTC (rev 50939)
+++ scummvm/trunk/engines/sci/console.cpp	2010-07-16 19:40:51 UTC (rev 50940)
@@ -1099,13 +1099,13 @@
 		return true;
 	}
 
-	return false;
+	return Cmd_Exit(0, 0);
 }
 
 bool Console::cmdRestartGame(int argc, const char **argv) {
 	_engine->_gamestate->abortScriptProcessing = kAbortRestartGame;;
 
-	return false;
+	return Cmd_Exit(0, 0);
 }
 
 bool Console::cmdClassTable(int argc, const char **argv) {
@@ -1341,7 +1341,7 @@
 	if (filename.hasSuffix(".seq") || filename.hasSuffix(".avi") || filename.hasSuffix(".vmd")) {
 		_videoFile = filename;
 		_videoFrameDelay = (argc == 2) ? 10 : atoi(argv[2]);
-		return false;
+		return Cmd_Exit(0, 0);
 	} else {
 		DebugPrintf("Unknown video file type\n");
 		return true;
@@ -1631,7 +1631,7 @@
 		DebugPrintf("Map %d is not available.\n", map);
 		return true;
 	}
-	return false;
+	return Cmd_Exit(0, 0);
 }
 
 bool Console::cmdSongLib(int argc, const char **argv) {
@@ -1676,8 +1676,7 @@
 	}
 
 	g_sci->_soundCmd->startNewSound(number);
-
-	return false;
+	return Cmd_Exit(0, 0);
 }
 
 bool Console::cmdToggleSound(int argc, const char **argv) {
@@ -2310,7 +2309,7 @@
 		_debugState.runningStep = atoi(argv[1]) - 1;
 	_debugState.debugging = true;
 
-	return false;
+	return Cmd_Exit(0, 0);
 }
 
 bool Console::cmdStepOver(int argc, const char **argv) {
@@ -2318,14 +2317,14 @@
 	_debugState.seekLevel = _engine->_gamestate->_executionStack.size();
 	_debugState.debugging = true;
 
-	return false;
+	return Cmd_Exit(0, 0);
 }
 
 bool Console::cmdStepEvent(int argc, const char **argv) {
 	_debugState.stopOnEvent = true;
 	_debugState.debugging = true;
 
-	return false;
+	return Cmd_Exit(0, 0);
 }
 
 bool Console::cmdStepRet(int argc, const char **argv) {
@@ -2333,7 +2332,7 @@
 	_debugState.seekLevel = _engine->_gamestate->_executionStack.size() - 1;
 	_debugState.debugging = true;
 
-	return false;
+	return Cmd_Exit(0, 0);
 }
 
 bool Console::cmdStepGlobal(int argc, const char **argv) {
@@ -2347,7 +2346,7 @@
 	_debugState.seekSpecial = atoi(argv[1]);
 	_debugState.debugging = true;
 
-	return false;
+	return Cmd_Exit(0, 0);
 }
 
 bool Console::cmdStepCallk(int argc, const char **argv) {
@@ -2380,7 +2379,7 @@
 	}
 	_debugState.debugging = true;
 
-	return false;
+	return Cmd_Exit(0, 0);
 }
 
 bool Console::cmdDisassemble(int argc, const char **argv) {
@@ -2884,7 +2883,7 @@
 		exit(0);
 	}
 
-	return false;
+	return Cmd_Exit(0, 0);
 }
 
 bool Console::cmdAddresses(int argc, const char **argv) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.