aboutsummaryrefslogtreecommitdiff
path: root/engines/sword1/animation.h
diff options
context:
space:
mode:
Diffstat (limited to 'engines/sword1/animation.h')
-rw-r--r--engines/sword1/animation.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/engines/sword1/animation.h b/engines/sword1/animation.h
index c436607211..f64b03dd1b 100644
--- a/engines/sword1/animation.h
+++ b/engines/sword1/animation.h
@@ -24,7 +24,6 @@
#define SWORD1_ANIMATION_H
#include "video/dxa_decoder.h"
-#include "video/smk_decoder.h"
#include "video/video_decoder.h"
#include "common/list.h"
@@ -38,7 +37,8 @@ namespace Sword1 {
enum DecoderType {
kVideoDecoderDXA = 0,
- kVideoDecoderSMK = 1
+ kVideoDecoderSMK = 1,
+ kVideoDecoderPSX = 2
};
class MovieText {
@@ -83,8 +83,8 @@ protected:
Common::List<MovieText> _movieTexts;
int _textX, _textY, _textWidth, _textHeight;
int _textColor;
- byte _black;
- byte _c1Color, _c2Color, _c3Color, _c4Color;
+ uint32 _black;
+ uint32 _c1Color, _c2Color, _c3Color, _c4Color;
DecoderType _decoderType;
Video::VideoDecoder *_decoder;
@@ -93,9 +93,10 @@ protected:
bool playVideo();
void performPostProcessing(byte *screen);
+ void drawFramePSX(const Graphics::Surface *frame);
- byte findBlackPalIndex();
- byte findTextColorPalIndex();
+ uint32 getBlackColor();
+ uint32 findTextColor();
void convertColor(byte r, byte g, byte b, float &h, float &s, float &v);
};