[Scummvm-cvs-logs] CVS: scummvm/sky/music musicbase.cpp,1.8,1.9 musicbase.h,1.8,1.9

[Jonathan Gray]

Update of /cvsroot/scummvm/scummvm/sky/music
In directory sc8-pr-cvs1:/tmp/cvs-serv24474

Modified Files:
	musicbase.cpp musicbase.h 
Log Message:
revert to last revision of musicbase that doesn't cause a segfault here anymore

Index: musicbase.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/musicbase.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- musicbase.cpp	8 Jul 2003 23:25:51 -0000	1.8
+++ musicbase.cpp	9 Jul 2003 04:31:24 -0000	1.9
@@ -45,7 +45,6 @@
 	_currentSection = pSection;
 	_musicData = _skyDisk->loadFile(_driverFileBase + FILES_PER_SECTION * pSection, NULL);
 	_allowedCommands = 0;
-	_playTime = 0;
 	_musicTempo0 = 0x78; // init constants taken from idb file, area ~0x1060
 	_musicTempo1 = 0xC0;
 	_onNextPoll.doReInit = false;
@@ -137,12 +136,6 @@
 		error("Music %d requested but doesn't exist in file.\n", _onNextPoll.musicToProcess);
 		return;
 	}
-
-	if ((_onNextPoll.musicToProcess == 6) && (_currentSection == 5) && (_playTime < 3456))
-			return ;
-
-	_playTime = 0;
-
 	if (_currentMusic != 0)
 		stopMusic();
 
@@ -172,7 +165,6 @@
 		loadNewMusic();
 
 	_aktTime += _tempo;
-	_playTime++;
 
 	for (uint8 cnt = 0; cnt < _numberOfChannels; cnt++) {
 		newTempo = _channels[cnt]->process((uint16)(_aktTime >> 16));

Index: musicbase.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/musicbase.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- musicbase.h	8 Jul 2003 23:25:51 -0000	1.8
+++ musicbase.h	9 Jul 2003 04:31:24 -0000	1.9
@@ -69,7 +69,6 @@
 	uint8 _musicTempo1; // given once per music
 	uint32 _tempo;      // calculated from musicTempo0 and musicTempo1
 	uint32 _aktTime;
-	uint32 _playTime;
 	Actions _onNextPoll;
 	SkyChannelBase *_channels[10];
 	OSystem::MutexRef _mutex;