[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.121,1.122
Travis Howell
kirben at users.sourceforge.net
Tue May 4 07:58:27 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga actionmap.cpp,1.6,1.7 actor.cpp,1.9,1.10 animation.cpp,1.4,1.5 animation.h,1.4,1.5 font.cpp,1.6,1.7 image.cpp,1.7,1.8 isomap.cpp,1.5,1.6 module.mk,1.12,1.13 objectmap.cpp,1.7,1.8 palanim.cpp,1.6,1.7 rscfile.cpp,1.4,1.5 scene.cpp,1.7,1.8 script.cpp,1.5,1.6 script.h,1.4,1.5 sdebug.cpp,1.3,1.4 sndres.cpp,1.11,1.12 sprite.cpp,1.6,1.7 sthread.cpp,1.5,1.6 sthread.h,1.3,1.4 yslib.h,1.5,1.6 ys_binread.cpp,1.5,NONE ys_binwrite.cpp,1.4,NONE
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.111.2.2,1.111.2.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8371/scumm/smush
Modified Files:
smush_player.cpp
Log Message:
Fix insane regression.
Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- smush_player.cpp 1 May 2004 18:53:03 -0000 1.121
+++ smush_player.cpp 4 May 2004 14:56:47 -0000 1.122
@@ -717,8 +717,13 @@
_alreadyInit = true;
}
- _width = width;
- _height = height;
+ if ((height == 242) && (width == 384)) {
+ _width = width;
+ _height = height;
+ } else {
+ _width = _vm->_screenWidth;
+ _height = _vm->_screenHeight;
+ }
switch (codec) {
case 1:
@@ -776,8 +781,14 @@
_alreadyInit = true;
}
- _width = width;
- _height = height;
+ if ((height == 242) && (width == 384)) {
+ _width = width;
+ _height = height;
+ } else {
+ _width = _vm->_screenWidth;
+ _height = _vm->_screenHeight;
+ }
+
b.getWord();
b.getWord();
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga actionmap.cpp,1.6,1.7 actor.cpp,1.9,1.10 animation.cpp,1.4,1.5 animation.h,1.4,1.5 font.cpp,1.6,1.7 image.cpp,1.7,1.8 isomap.cpp,1.5,1.6 module.mk,1.12,1.13 objectmap.cpp,1.7,1.8 palanim.cpp,1.6,1.7 rscfile.cpp,1.4,1.5 scene.cpp,1.7,1.8 script.cpp,1.5,1.6 script.h,1.4,1.5 sdebug.cpp,1.3,1.4 sndres.cpp,1.11,1.12 sprite.cpp,1.6,1.7 sthread.cpp,1.5,1.6 sthread.h,1.3,1.4 yslib.h,1.5,1.6 ys_binread.cpp,1.5,NONE ys_binwrite.cpp,1.4,NONE
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.111.2.2,1.111.2.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list