[Scummvm-cvs-logs] CVS: scummvm/saga input.cpp,1.39,1.40 sfuncs.cpp,1.112,1.113

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25968

Modified Files:
	input.cpp sfuncs.cpp 
Log Message:
Implement proper quitting. Added quitting to sfScriptGotoScene.


Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/input.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- input.cpp	21 Apr 2005 01:30:07 -0000	1.39
+++ input.cpp	18 May 2005 16:18:00 -0000	1.40
@@ -127,7 +127,7 @@
 			_mousePos = event.mouse;
 			break;
 		case OSystem::EVENT_QUIT:
-			_system->quit();
+			_vm->shutDown();
 			break;
 		default:
 			break;

Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- sfuncs.cpp	15 May 2005 17:45:59 -0000	1.112
+++ sfuncs.cpp	18 May 2005 16:18:00 -0000	1.113
@@ -504,7 +504,8 @@
 	sceneNumber = thread->pop();
 	entrance = thread->pop();
 	if (sceneNumber < 0) {
-		//TODO: quit from game at all
+		_vm->shutDown();
+		return;
 	}
 
 	// This is used for latter demos where all places on world map except