[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


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;





More information about the Scummvm-git-logs mailing list