diff options
| -rw-r--r-- | sword1/animation.cpp | 12 | ||||
| -rw-r--r-- | sword1/animation.h | 18 | ||||
| -rw-r--r-- | sword2/driver/animation.h | 16 |
3 files changed, 23 insertions, 23 deletions
diff --git a/sword1/animation.cpp b/sword1/animation.cpp index 4f3fa9df69..c289ea86a1 100644 --- a/sword1/animation.cpp +++ b/sword1/animation.cpp @@ -37,10 +37,10 @@ AnimationState::~AnimationState() { if (decoder) mpeg2_close(decoder); delete mpgfile; - delete sndfile; + delete sndfile; #ifndef BACKEND_8BIT - _sys->hide_overlay(); - delete overlay; + _sys->hide_overlay(); + delete overlay; #endif #endif } @@ -57,7 +57,7 @@ bool AnimationState::init(const char *basename) { #ifdef BACKEND_8BIT - int i, p; + int i, p; // Load lookup palettes // TODO: Binary format so we can use File class @@ -269,7 +269,7 @@ void AnimationState::plotYUV(NewGuiColor *lut, int width, int height, byte *cons ptr[linepos ] = lut[i + dat[0][ ypos ]]; ptr[640 + linepos++] = lut[i + dat[0][width + ypos++]]; - } + } linepos += (2 * 640 - width); ypos += width; } @@ -360,7 +360,7 @@ bool AnimationState::decodeFrame() { framenum++; return true; - } + } break; default: diff --git a/sword1/animation.h b/sword1/animation.h index 4907c5b2f0..61f2b788ac 100644 --- a/sword1/animation.h +++ b/sword1/animation.h @@ -26,13 +26,13 @@ // #define USE_MPEG2_0_3_1 #ifdef _MSC_VER -typedef signed char int8_t; -typedef signed short int16_t; -typedef signed int int32_t; +typedef int8 int8_t; +typedef int16 int16_t; +typedef int32 int32_t; -typedef unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; +typedef uint8 uint8_t; +typedef uint16 uint16_t; +typedef uint32 uint32_t; #else #include <inttypes.h> #endif @@ -111,9 +111,9 @@ private: byte pal[4 * 256]; } palettes[50]; #else - static NewGuiColor lookup2[BITDEPTH * BITDEPTH * 256]; - NewGuiColor * overlay; - static bool lookupInit; + static NewGuiColor lookup2[BITDEPTH * BITDEPTH * 256]; + NewGuiColor * overlay; + static bool lookupInit; #endif diff --git a/sword2/driver/animation.h b/sword2/driver/animation.h index 3d53e7eb25..4841a26d3f 100644 --- a/sword2/driver/animation.h +++ b/sword2/driver/animation.h @@ -26,13 +26,13 @@ // #define USE_MPEG2_0_3_1 #ifdef _MSC_VER -typedef signed char int8_t; +typedef int8 int8_t; typedef signed short int16_t; -typedef signed int int32_t; +typedef int32 int32_t; -typedef unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; +typedef uint8 uint8_t; +typedef uint16 uint16_t; +typedef uint32 uint32_t; #else #include <inttypes.h> #endif @@ -104,9 +104,9 @@ private: byte pal[4 * 256]; } palettes[50]; #else - static NewGuiColor lookup2[BITDEPTH * BITDEPTH * 256]; - NewGuiColor *overlay; - static bool lookupInit; + static NewGuiColor lookup2[BITDEPTH * BITDEPTH * 256]; + NewGuiColor *overlay; + static bool lookupInit; #endif |