diff options
| author | Jonathan Gray | 2003-07-09 04:31:24 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2003-07-09 04:31:24 +0000 |
| commit | 345c368cf0c6587473808f28313c29cf9cdcb9ce (patch) | |
| tree | 7af9a72998514e53b6493c6461a7be8d0e867890 /sky/music | |
| parent | 6d84c679069ea1d56f3eb84406bd5a51d05556f9 (diff) | |
| download | scummvm-rg350-345c368cf0c6587473808f28313c29cf9cdcb9ce.tar.gz scummvm-rg350-345c368cf0c6587473808f28313c29cf9cdcb9ce.tar.bz2 scummvm-rg350-345c368cf0c6587473808f28313c29cf9cdcb9ce.zip | |
revert to last revision of musicbase that doesn't cause a segfault here anymore
svn-id: r8876
Diffstat (limited to 'sky/music')
| -rw-r--r-- | sky/music/musicbase.cpp | 8 | ||||
| -rw-r--r-- | sky/music/musicbase.h | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/sky/music/musicbase.cpp b/sky/music/musicbase.cpp index cec29d7e29..327e216c3e 100644 --- a/sky/music/musicbase.cpp +++ b/sky/music/musicbase.cpp @@ -45,7 +45,6 @@ void SkyMusicBase::loadSection(uint8 pSection) _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 @@ void SkyMusicBase::loadNewMusic(void) 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 @@ void SkyMusicBase::pollMusic(void) loadNewMusic(); _aktTime += _tempo; - _playTime++; for (uint8 cnt = 0; cnt < _numberOfChannels; cnt++) { newTempo = _channels[cnt]->process((uint16)(_aktTime >> 16)); diff --git a/sky/music/musicbase.h b/sky/music/musicbase.h index 657de9d5b0..db69647f5d 100644 --- a/sky/music/musicbase.h +++ b/sky/music/musicbase.h @@ -69,7 +69,6 @@ protected: 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; |