aboutsummaryrefslogtreecommitdiff
path: root/sword1
diff options
context:
space:
mode:
authorMax Horn2004-03-21 21:20:25 +0000
committerMax Horn2004-03-21 21:20:25 +0000
commita9789acfc61a057c82c6cc42386afc9b23813c24 (patch)
tree3e36be49dd35ceb59ce98f74aec92cd9c60198a4 /sword1
parent23dbd0de994ebfc97c65ab9deb96b052d1983426 (diff)
downloadscummvm-rg350-a9789acfc61a057c82c6cc42386afc9b23813c24.tar.gz
scummvm-rg350-a9789acfc61a057c82c6cc42386afc9b23813c24.tar.bz2
scummvm-rg350-a9789acfc61a057c82c6cc42386afc9b23813c24.zip
Moved Surface/Font code into new 'graphics' module
svn-id: r13357
Diffstat (limited to 'sword1')
-rw-r--r--sword1/animation.h28
1 files changed, 1 insertions, 27 deletions
diff --git a/sword1/animation.h b/sword1/animation.h
index 1c55bc4f07..1d9a2aecec 100644
--- a/sword1/animation.h
+++ b/sword1/animation.h
@@ -22,33 +22,7 @@
#ifndef ANIMATION_H
#define ANIMATION_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 int16 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>
-}
-
-#ifdef USE_MPEG2_0_3_1
-typedef int mpeg2_state_t;
-typedef sequence_t mpeg2_sequence_t;
-#define STATE_BUFFER -1
-#endif
-
-#endif
+#include "graphics/animation.h"
#include "sword1/screen.h"
#include "sword1/sound.h"