[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.62,1.63
Pawel Kolodziejski
aquadran at users.sourceforge.net
Mon Nov 17 13:34:04 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm help.cpp,1.12,1.13 imuse_digi.cpp,1.56,1.57 resource.cpp,1.173,1.174 script_v6.cpp,1.211,1.212 scumm.h,1.324,1.325 scummvm.cpp,2.479,2.480 string.cpp,1.169,1.170
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.63,1.64
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv12060
Modified Files:
smush_player.cpp
Log Message:
fixed 'if' at load nut smush files for comi
Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- smush_player.cpp 17 Nov 2003 21:16:43 -0000 1.62
+++ smush_player.cpp 17 Nov 2003 21:33:25 -0000 1.63
@@ -834,8 +834,8 @@
_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 @@
}
} 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");
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm help.cpp,1.12,1.13 imuse_digi.cpp,1.56,1.57 resource.cpp,1.173,1.174 script_v6.cpp,1.211,1.212 scumm.h,1.324,1.325 scummvm.cpp,2.479,2.480 string.cpp,1.169,1.170
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.63,1.64
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list