aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorPaweł Kołodziejski2003-11-17 21:33:25 +0000
committerPaweł Kołodziejski2003-11-17 21:33:25 +0000
commit798ffd694b90dc37f8b10e7d5c8b1780c1dab958 (patch)
tree25c34b28313487a075df8a574e6a806c5a81c083 /scumm
parent185395ca36af5851d6b59b00ab70ad5a74d32664 (diff)
downloadscummvm-rg350-798ffd694b90dc37f8b10e7d5c8b1780c1dab958.tar.gz
scummvm-rg350-798ffd694b90dc37f8b10e7d5c8b1780c1dab958.tar.bz2
scummvm-rg350-798ffd694b90dc37f8b10e7d5c8b1780c1dab958.zip
fixed 'if' at load nut smush files for comi
svn-id: r11327
Diffstat (limited to 'scumm')
-rw-r--r--scumm/smush/smush_player.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index 6d5878aaa8..666d2741b3 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -834,8 +834,8 @@ void SmushPlayer::setupAnim(const char *file, const char *directory) {
_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);
+ _sf[0] = new SmushFont(true, false);
+ _sf[0]->loadFont("scummfnt.nut", directory);
}
} else if (_scumm->_gameId == GID_DIG) {
if (!(_scumm->_features & GF_DEMO)) {
@@ -847,11 +847,11 @@ void SmushPlayer::setupAnim(const char *file, const char *directory) {
}
} else if (_scumm->_gameId == GID_CMI) {
for (i = 0; i < 5; i++) {
- 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);
- }
+ if ((_scumm->_features & GF_DEMO) && (i == 5))
+ break;
+ 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");