[Scummvm-cvs-logs] CVS: scummvm/graphics animation.cpp,1.28,1.29 animation.h,1.15,1.16
Max Horn
fingolfin at users.sourceforge.net
Tue May 10 16:00:32 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen queen.cpp,1.127,1.128 resource.cpp,1.57,1.58 resource.h,1.42,1.43 sound.cpp,1.53,1.54 talk.cpp,1.115,1.116
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword1 animation.cpp,1.38,1.39 control.cpp,1.51,1.52 credits.cpp,1.11,1.12 music.cpp,1.41,1.42 music.h,1.18,1.19 resman.cpp,1.29,1.30 resman.h,1.14,1.15 sound.h,1.18,1.19 sword1.cpp,1.85,1.86
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17315/graphics
Modified Files:
animation.cpp animation.h
Log Message:
Moved class File and the MD5 stuff to namespace Common
Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/graphics/animation.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- animation.cpp 1 May 2005 17:44:54 -0000 1.28
+++ animation.cpp 10 May 2005 22:55:47 -0000 1.29
@@ -71,7 +71,7 @@
// Load lookup palettes
sprintf(tempFile, "%s.pal", name);
- File f;
+ Common::File f;
if (!f.open(tempFile)) {
warning("Cutscene: %s palette missing", tempFile);
@@ -120,7 +120,7 @@
#endif
// Open MPEG2 stream
- _mpegFile = new File();
+ _mpegFile = new Common::File();
sprintf(tempFile, "%s.mp2", name);
if (!_mpegFile->open(tempFile)) {
warning("Cutscene: Could not open %s", tempFile);
Index: animation.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/graphics/animation.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- animation.h 26 Apr 2005 11:05:06 -0000 1.15
+++ animation.h 10 May 2005 22:55:47 -0000 1.16
@@ -63,6 +63,10 @@
#define BUFFER_SIZE 4096
+namespace Common {
+ class File;
+}
+
namespace Graphics {
class BaseAnimationState {
@@ -82,7 +86,7 @@
const mpeg2_info_t *_mpegInfo;
#endif
- File *_mpegFile;
+ Common::File *_mpegFile;
SoundHandle _bgSound;
AudioStream *_bgSoundStream;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen queen.cpp,1.127,1.128 resource.cpp,1.57,1.58 resource.h,1.42,1.43 sound.cpp,1.53,1.54 talk.cpp,1.115,1.116
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword1 animation.cpp,1.38,1.39 control.cpp,1.51,1.52 credits.cpp,1.11,1.12 music.cpp,1.41,1.42 music.h,1.18,1.19 resman.cpp,1.29,1.30 resman.h,1.14,1.15 sound.h,1.18,1.19 sword1.cpp,1.85,1.86
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list