[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.173,1.174
Jonathan Gray
khalek at users.sourceforge.net
Tue Aug 9 23:17:33 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: residual driver_tinygl.cpp,1.21,1.22 engine.cpp,1.81,1.82 engine.h,1.31,1.32 lua.cpp,1.148,1.149 registry.cpp,1.12,1.13 textobject.cpp,1.28,1.29
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_sndmgr.cpp,1.73,1.74
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19296/scumm/smush
Modified Files:
smush_player.cpp
Log Message:
Rest of the changes required for tremor to actually work.
Based on patches against 0.7.1 by Jolan Luff.
Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- smush_player.cpp 30 Jul 2005 21:11:34 -0000 1.173
+++ smush_player.cpp 10 Aug 2005 06:16:25 -0000 1.174
@@ -1199,7 +1199,7 @@
if (i == NULL) {
error("invalid filename : %s", filename);
}
-#if defined(USE_MAD) || defined(USE_VORBIS)
+#if defined(USE_MAD) || defined(USE_VORBIS) || defined(USE_TREMOR)
char fname[260];
#endif
#ifdef USE_MAD
@@ -1213,7 +1213,7 @@
return;
}
#endif
-#ifdef USE_VORBIS
+#if defined(USE_VORBIS) || defined(USE_TREMOR)
memcpy(fname, filename, i - filename);
strcpy(fname + (i - filename), ".ogg");
_compressedFile.open(fname);
- Previous message: [Scummvm-cvs-logs] CVS: residual driver_tinygl.cpp,1.21,1.22 engine.cpp,1.81,1.82 engine.h,1.31,1.32 lua.cpp,1.148,1.149 registry.cpp,1.12,1.13 textobject.cpp,1.28,1.29
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_sndmgr.cpp,1.73,1.74
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list