[Scummvm-cvs-logs] CVS: scummvm/sword2 function.cpp,1.53,1.54
Pawel Kolodziejski
aquadran at users.sourceforge.net
Mon Jan 12 11:09:03 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sword2/driver animation.h,1.1,1.2 d_draw.h,1.21,1.22 render.cpp,1.49,1.50
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_music.cpp,NONE,1.1 dimuse.cpp,1.25,1.26 dimuse.h,1.15,1.16 dimuse_tables.cpp,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1:/tmp/cvs-serv18424
Modified Files:
function.cpp
Log Message:
- whitespaces
- fix for compilation at MAX, at include types
- changed to our types
Index: function.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/function.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- function.cpp 12 Jan 2004 08:01:21 -0000 1.53
+++ function.cpp 12 Jan 2004 19:08:04 -0000 1.54
@@ -614,7 +614,7 @@
// credits. Note that musicTimeRemaining() will return 0 if the music
// is muted, so we need a sensible fallback for that case.
- uint32 musicLength = MAX(1000 * (_vm->_sound->musicTimeRemaining() - 3), 25 * scrollSteps);
+ uint32 musicLength = MAX(1000 * (_vm->_sound->musicTimeRemaining() - 3), 25 * (int32)scrollSteps);
while (scrollPos < scrollSteps && !_vm->_quit) {
bool foundStartLine = false;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sword2/driver animation.h,1.1,1.2 d_draw.h,1.21,1.22 render.cpp,1.49,1.50
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_music.cpp,NONE,1.1 dimuse.cpp,1.25,1.26 dimuse.h,1.15,1.16 dimuse_tables.cpp,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list