From 6ea1d54f5067da0e75717e5a7d97d046bf4591f6 Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Sat, 12 Jul 2003 16:54:30 +0000 Subject: [PATCH] A few mino changes for pc gamer demo svn-id: r8949 --- sky/control.cpp | 2 +- sky/music/adlibchannel.cpp | 2 +- sky/music/adlibmusic.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sky/control.cpp b/sky/control.cpp index d0c21f6fce5..0aad8ba8e05 100644 --- a/sky/control.cpp +++ b/sky/control.cpp @@ -1595,7 +1595,7 @@ void SkyControl::applyDiff(uint16 *data, uint16 *diffData) { } void SkyControl::restartGame(void) { - if (SkyState::_systemVars.gameVersion == 267) + if (SkyState::_systemVars.gameVersion <= 267) return; // no restart for floppy demo uint16 *resetData; diff --git a/sky/music/adlibchannel.cpp b/sky/music/adlibchannel.cpp index 6303e261ed6..bc114d80e1d 100644 --- a/sky/music/adlibchannel.cpp +++ b/sky/music/adlibchannel.cpp @@ -42,7 +42,7 @@ SkyAdlibChannel::SkyAdlibChannel(FM_OPL *opl, uint8 *pMusicData, uint16 startOfD uint16 instrumentDataLoc; - if (SkyState::_systemVars.gameVersion == 267) { + if (SkyState::_systemVars.gameVersion <= 267) { instrumentDataLoc = (_musicData[0x11FC] << 8) | _musicData[0x11FB]; _frequenceTable = (uint16*)(_musicData+0x7F4); _registerTable = _musicData+0xDF4; diff --git a/sky/music/adlibmusic.cpp b/sky/music/adlibmusic.cpp index 5ce82a6f3c1..8236482d550 100644 --- a/sky/music/adlibmusic.cpp +++ b/sky/music/adlibmusic.cpp @@ -85,7 +85,7 @@ void SkyAdlibMusic::premixerCall(int16 *buf, uint len) { void SkyAdlibMusic::setupPointers(void) { - if (SkyState::_systemVars.gameVersion == 267) { + if (SkyState::_systemVars.gameVersion <= 267) { // disk demo uses a different adlib driver version, some offsets have changed _musicDataLoc = (_musicData[0x11F8] << 8) | _musicData[0x11F7]; _initSequence = _musicData + 0xE87;