[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.78,1.79

Chris Apers chrilith at users.sourceforge.net
Mon May 26 01:25:03 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv17446

Modified Files:
	saveload.cpp 
Log Message:
No more needed

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- saveload.cpp	26 May 2003 02:26:13 -0000	1.78
+++ saveload.cpp	26 May 2003 08:24:34 -0000	1.79
@@ -73,14 +73,6 @@
 
 	Serializer ser(out, true, CURRENT_VER);
 	saveOrLoad(&ser, CURRENT_VER);
-#ifdef __PALM_OS__
-	if (_imuse && _saveSound) {	// moved here to prevent stack overflow on palmos
-		_imuse->save_or_load(&ser, this);
-		_imuse->set_master_volume (_sound->_sound_volume_master);
-		_imuse->set_music_volume (_sound->_sound_volume_music);
-	}
-#endif
-
 	delete out;
 	debug(1, "State saved as '%s'", filename);
 	return true;
@@ -149,13 +141,6 @@
 	
 	Serializer ser(out, false, hdr.ver);
 	saveOrLoad(&ser, hdr.ver);
-#ifdef __PALM_OS__
-	if (_imuse && _saveSound) {	// moved here to prevent stack overflow on palmos
-		_imuse->save_or_load(&ser, this);
-		_imuse->set_master_volume (_sound->_sound_volume_master);
-		_imuse->set_music_volume (_sound->_sound_volume_music);
-	}
-#endif
 	delete out;
 
 	sb = _screenB;
@@ -629,13 +614,11 @@
 		}
 	}
 	
-#ifndef __PALM_OS__// moved to ::loadState/saveState to prevent stack overflow on palmos
 	if (_imuse && _saveSound) {
 		_imuse->save_or_load(s, this);
 		_imuse->set_master_volume (_sound->_sound_volume_master);
 		_imuse->set_music_volume (_sound->_sound_volume_music);
 	}
-#endif
 }
 
 void Scumm::saveLoadResource(Serializer *ser, int type, int idx) {





More information about the Scummvm-git-logs mailing list