diff options
| author | Paweł Kołodziejski | 2003-11-17 21:16:43 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2003-11-17 21:16:43 +0000 |
| commit | 185395ca36af5851d6b59b00ab70ad5a74d32664 (patch) | |
| tree | 04947e99854b244b17f00cb920a29faa94224e5e /scumm/smush | |
| parent | 1b77e5c41f6a5d7f45deac6f308b8841e8c40b24 (diff) | |
| download | scummvm-rg350-185395ca36af5851d6b59b00ab70ad5a74d32664.tar.gz scummvm-rg350-185395ca36af5851d6b59b00ab70ad5a74d32664.tar.bz2 scummvm-rg350-185395ca36af5851d6b59b00ab70ad5a74d32664.zip | |
replaced demo GIDs wth GF_DEMO
svn-id: r11326
Diffstat (limited to 'scumm/smush')
| -rw-r--r-- | scumm/smush/smush_player.cpp | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp index a6ad89ba08..6d5878aaa8 100644 --- a/scumm/smush/smush_player.cpp +++ b/scumm/smush/smush_player.cpp @@ -828,24 +828,30 @@ void SmushPlayer::setupAnim(const char *file, const char *directory) { readString(file, directory); if (_scumm->_gameId == GID_FT) { - _sf[0] = new SmushFont(true, false); - _sf[2] = new SmushFont(true, false); - _sf[0]->loadFont("scummfnt.nut", directory); - _sf[2]->loadFont("titlfnt.nut", directory); - } else if (_scumm->_gameId == GID_FTDEMO) { + if (!(_scumm->_features & GF_DEMO)) { + _sf[0] = new SmushFont(true, false); + _sf[2] = new SmushFont(true, false); + _sf[0]->loadFont("scummfnt.nut", directory); + _sf[2]->loadFont("titlfnt.nut", directory); + } else { _sf[0] = new SmushFont(true, false); _sf[0]->loadFont("scummfnt.nut", directory); + } } else if (_scumm->_gameId == GID_DIG) { - for (i = 0; i < 4; i++) { - sprintf(file_font, "font%d.nut", i); - _sf[i] = new SmushFont(i != 0, false); - _sf[i]->loadFont(file_font, directory); + if (!(_scumm->_features & GF_DEMO)) { + for (i = 0; i < 4; i++) { + sprintf(file_font, "font%d.nut", i); + _sf[i] = new SmushFont(i != 0, false); + _sf[i]->loadFont(file_font, directory); + } } } else if (_scumm->_gameId == GID_CMI) { for (i = 0; i < 5; i++) { - sprintf(file_font, "font%d.nut", i); - _sf[i] = new SmushFont(false, true); - _sf[i]->loadFont(file_font, directory); + if ((!(_scumm->_features & GF_DEMO)) && (i != 5)) { + sprintf(file_font, "font%d.nut", i); + _sf[i] = new SmushFont(false, true); + _sf[i]->loadFont(file_font, directory); + } } } else { error("SmushPlayer::setupAnim() Unknown font setup for game"); |