[Scummvm-cvs-logs] CVS: scummvm/sword2/driver animation.h,1.23,1.24
Max Horn
fingolfin at users.sourceforge.net
Sun Mar 21 13:31:22 CET 2004
Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28619/sword2/driver
Modified Files:
animation.h
Log Message:
Moved Surface/Font code into new 'graphics' module
Index: animation.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/animation.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- animation.h 21 Mar 2004 18:49:04 -0000 1.23
+++ animation.h 21 Mar 2004 21:20:25 -0000 1.24
@@ -22,35 +22,10 @@
#ifndef ANIMATION_H
#define ANIMATION_H
-#include "sound/mixer.h"
-
-// Uncomment this if you are using libmpeg2 0.3.1.
-// #define USE_MPEG2_0_3_1
-
-#ifdef _MSC_VER
-typedef int8 int8_t;
-typedef signed short int16_t;
-typedef int32 int32_t;
-
-typedef uint8 uint8_t;
-typedef uint16 uint16_t;
-typedef uint32 uint32_t;
-#else
-#include <inttypes.h>
-#endif
-
-#ifdef USE_MPEG2
-extern "C" {
- #include <mpeg2dec/mpeg2.h>
-}
+#include "graphics/animation.h"
-#ifdef USE_MPEG2_0_3_1
-typedef int mpeg2_state_t;
-typedef sequence_t mpeg2_sequence_t;
-#define STATE_BUFFER -1
-#endif
+#include "sound/mixer.h"
-#endif
namespace Sword2 {
More information about the Scummvm-git-logs
mailing list