[Scummvm-cvs-logs] CVS: residual engine.cpp,1.63,1.64

Pawel Kolodziejski aquadran at users.sourceforge.net
Fri Jan 14 02:52:21 CET 2005


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

Modified Files:
	engine.cpp 
Log Message:
cleanup code. pause/unpase while saving

Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/engine.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- engine.cpp	12 Jan 2005 23:26:04 -0000	1.63
+++ engine.cpp	14 Jan 2005 10:51:19 -0000	1.64
@@ -167,9 +167,9 @@
 
 			g_driver->set3DMode();
 
-//			if (_currScene != NULL) {
-//				_currScene->setupLights();
-//			}
+			if (_currScene != NULL) {
+				_currScene->setupLights();
+			}
 
 			// Draw actors
 			for (ActorListType::iterator i = _actors.begin(); i != _actors.end(); i++) {
@@ -240,6 +240,7 @@
 }
 
 void Engine::savegameRestore() {
+	printf("Engine::savegameRestore() started.\n");
 	_savegameLoadRequest = false;
 	char filename[200];
 	if (_savegameFileName == NULL) {
@@ -280,6 +281,7 @@
 	gzclose(_savegameFileHandle);
 
 	//bundle_dofile("patch05.bin");
+	printf("Engine::savegameRestore() finished.\n");
 }
 
 void Engine::savegameCallback() {
@@ -320,6 +322,7 @@
 }
 
 void Engine::savegameSave() {
+	printf("Engine::savegameSave() started.\n");
 	_savegameSaveRequest = false;
 	char filename[200];
 	if (_savegameFileName == NULL) {
@@ -333,6 +336,9 @@
 		return;
 	}
 
+	g_imuse->pause(true);
+	g_smush->pause(true);
+
 	uint32 tag = 'RSAV';
 	uint32 version = 1;
 	savegameGzwrite(&tag, 4);
@@ -352,6 +358,10 @@
 	lua_Save(savegameGzwrite);
 
 	gzclose(_savegameFileHandle);
+
+	g_imuse->pause(false);
+	g_smush->pause(false);
+	printf("Engine::savegameSave() finished.\n");
 }
 
 void Engine::setScene(const char *name) {





More information about the Scummvm-git-logs mailing list