[Scummvm-cvs-logs] CVS: scummvm/sword2/driver animation.cpp,1.13,1.14
Max Horn
fingolfin at sc8-pr-cvs1.sourceforge.net
Thu Jan 22 13:07:31 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.39,1.40 dimuse_sndmgr.h,1.18,1.19
- Next message: [Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.118,1.119 graphics.cpp,1.88,1.89 graphics.h,1.64,1.65 logic.cpp,1.181,1.182 structs.h,1.34,1.35 talk.cpp,1.85,1.86
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15039/sword2/driver
Modified Files:
animation.cpp
Log Message:
whitespaces
Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/animation.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- animation.cpp 20 Jan 2004 13:26:00 -0000 1.13
+++ animation.cpp 22 Jan 2004 21:02:29 -0000 1.14
@@ -41,10 +41,10 @@
if (decoder)
mpeg2_close(decoder);
delete mpgfile;
- delete sndfile;
+ delete sndfile;
#ifndef BACKEND_8BIT
- _vm->_system->hide_overlay();
- delete overlay;
+ _vm->_system->hide_overlay();
+ delete overlay;
#endif
#endif
}
@@ -56,11 +56,11 @@
decoder = NULL;
mpgfile = NULL;
sndfile = NULL;
- bgSoundStream = NULL;
+ bgSoundStream = NULL;
#ifdef BACKEND_8BIT
- int i, p;
+ int i, p;
// Load lookup palettes
// TODO: Binary format so we can use File class
@@ -280,7 +280,7 @@
ptr[linepos ] = lut[i + dat[0][ ypos ]];
ptr[RENDERWIDE + linepos++] = lut[i + dat[0][width + ypos++]];
- }
+ }
linepos += (2 * 640 - width);
ypos += width;
}
@@ -370,12 +370,12 @@
#else
if ((bgSoundStream == NULL) ||
- (bgSoundStream->getSamplesPlayed()*12/bgSoundStream->getRate()) < (framenum+3)){
+ (bgSoundStream->getSamplesPlayed() * 12 / bgSoundStream->getRate()) < (framenum+3)){
plotYUV(lookup2, sequence_i->width, sequence_i->height, info->display_fbuf->buf);
if (bgSoundStream) {
- while ((bgSoundStream->getSamplesPlayed()*12/bgSoundStream->getRate()) < framenum + 1)
+ while ((bgSoundStream->getSamplesPlayed() * 12 / bgSoundStream->getRate()) < framenum + 1)
_vm->_system->delay_msecs(10);
} else {
ticks += 83;
@@ -390,7 +390,7 @@
framenum++;
return true;
- }
+ }
break;
default:
@@ -460,7 +460,7 @@
#endif
while (anim->decodeFrame()) {
- if (text && text[textCounter]) {
+ if (text && text[textCounter]) {
if (frameCounter == text[textCounter]->startFrame) {
openTextObject(text[textCounter]);
textVisible = true;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.39,1.40 dimuse_sndmgr.h,1.18,1.19
- Next message: [Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.118,1.119 graphics.cpp,1.88,1.89 graphics.h,1.64,1.65 logic.cpp,1.181,1.182 structs.h,1.34,1.35 talk.cpp,1.85,1.86
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list