diff options
| author | Max Horn | 2004-03-21 21:20:25 +0000 |
|---|---|---|
| committer | Max Horn | 2004-03-21 21:20:25 +0000 |
| commit | a9789acfc61a057c82c6cc42386afc9b23813c24 (patch) | |
| tree | 3e36be49dd35ceb59ce98f74aec92cd9c60198a4 /sword2 | |
| parent | 23dbd0de994ebfc97c65ab9deb96b052d1983426 (diff) | |
| download | scummvm-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 'sword2')
| -rw-r--r-- | sword2/driver/animation.h | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/sword2/driver/animation.h b/sword2/driver/animation.h index ab88b869df..5d399c7c63 100644 --- a/sword2/driver/animation.h +++ b/sword2/driver/animation.h @@ -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 +#include "graphics/animation.h" -#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 +#include "sound/mixer.h" -#endif namespace Sword2 { |