[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,1.23,1.24 sound.cpp,1.10,1.11

[Pawe? Ko?odziejski]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv17506/scumm

Modified Files:
	scummvm.cpp sound.cpp 
Log Message:
Timer is handled in Engine now

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- scummvm.cpp	17 Sep 2002 15:33:31 -0000	1.23
+++ scummvm.cpp	18 Sep 2002 10:22:36 -0000	1.24
@@ -44,9 +44,9 @@
 Scumm *g_scumm = 0;
 
 
-void autosave(Scumm * scumm)
+void autosave(void * engine)
 {
-	scumm->_doAutosave = true;
+	g_scumm->_doAutosave = true;
 }
 
 void Scumm::initRandSeeds()
@@ -106,8 +106,8 @@
 	
 	_newgui = new NewGui(this);
 	_bundle = new Bundle();
-	_timer = new Timer(this);
 	_sound = new Sound(this);
+	_timer = Engine::_timer;
 
 	_sound->_sound_volume_master = 0;
 	_sound->_sound_volume_sfx = detector->_sfx_volume;	
@@ -159,7 +159,6 @@
 	delete _gui;
 	delete _newgui;
 	delete _bundle;
-	delete _timer;
 	delete _sound;
 	delete _imuse;
 	if (_existLanguageFile) delete _languageBuffer;

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sound.cpp	16 Sep 2002 12:10:19 -0000	1.10
+++ sound.cpp	18 Sep 2002 10:22:36 -0000	1.11
@@ -828,8 +828,8 @@
 	return r;
 }
 
-static void music_handler (Scumm * scumm) {
-	scumm->_sound->bundleMusicHandler(scumm);
+static void music_handler (void * engine) {
+	g_scumm->_sound->bundleMusicHandler(g_scumm);
 }
 
 #define OUTPUT_SIZE 66150 // ((22050 * 2 * 2) / 4) * 3