diff options
author | Paul Gilbert | 2018-03-10 22:02:36 -0500 |
---|---|---|
committer | Paul Gilbert | 2018-03-10 22:02:36 -0500 |
commit | 782d4fbb06d5cb9cd2bae75f085d8c43231c9834 (patch) | |
tree | 2eea7fa540728912fbcc740a3eefa2d6b5699330 | |
parent | f4af55adc2e85825fd0ced648f81af4ffbe446e7 (diff) | |
download | scummvm-rg350-782d4fbb06d5cb9cd2bae75f085d8c43231c9834.tar.gz scummvm-rg350-782d4fbb06d5cb9cd2bae75f085d8c43231c9834.tar.bz2 scummvm-rg350-782d4fbb06d5cb9cd2bae75f085d8c43231c9834.zip |
XEEN: Compilation fix
-rw-r--r-- | engines/xeen/cutscenes.cpp | 4 | ||||
-rw-r--r-- | engines/xeen/cutscenes.h | 11 | ||||
-rw-r--r-- | engines/xeen/worldofxeen/clouds_cutscenes.h | 1 | ||||
-rw-r--r-- | engines/xeen/worldofxeen/darkside_cutscenes.h | 1 | ||||
-rw-r--r-- | engines/xeen/worldofxeen/worldofxeen_cutscenes.h | 1 |
5 files changed, 4 insertions, 14 deletions
diff --git a/engines/xeen/cutscenes.cpp b/engines/xeen/cutscenes.cpp index 667354a83a..d799049b54 100644 --- a/engines/xeen/cutscenes.cpp +++ b/engines/xeen/cutscenes.cpp @@ -25,10 +25,6 @@ namespace Xeen { -bool Cutscenes::wait(uint numFrames, bool interruptable) { - return _subtitles.wait(numFrames, interruptable); -} - uint Cutscenes::getSpeakingFrame(uint minFrame, uint maxFrame) { uint interval = g_system->getMillis() / 100; return minFrame + interval % (maxFrame + 1 - minFrame); diff --git a/engines/xeen/cutscenes.h b/engines/xeen/cutscenes.h index 4e7a5471da..5ce7cababe 100644 --- a/engines/xeen/cutscenes.h +++ b/engines/xeen/cutscenes.h @@ -29,27 +29,18 @@ namespace Xeen { -#define WAIT(TIME) if (Cutscenes::wait(TIME)) return false +#define WAIT(TIME) if (_subtitles.wait(TIME)) return false class XeenEngine; class Cutscenes { protected: XeenEngine *_vm; - Subtitles _subtitles; protected: Cutscenes(XeenEngine *vm) : _vm(vm) {} virtual ~Cutscenes() {} /** - * Waits for a given number of frames - * @param numFrames Number of frames to wait - * @param interruptable If set, aborts if the mouse or a key is pressed - * @returns True if the wait was aborted - */ - bool wait(uint numFrames, bool interruptable = true); - - /** * Get a speaking frame from a range */ uint getSpeakingFrame(uint minFrame, uint maxFrame); diff --git a/engines/xeen/worldofxeen/clouds_cutscenes.h b/engines/xeen/worldofxeen/clouds_cutscenes.h index dd632ebf8f..39fded63ea 100644 --- a/engines/xeen/worldofxeen/clouds_cutscenes.h +++ b/engines/xeen/worldofxeen/clouds_cutscenes.h @@ -39,6 +39,7 @@ private: static const byte _DECODE_TABLE1[256]; static const byte _DECODE_TABLE2[256]; private: + Subtitles _subtitles; SpriteResource _mirror, _mirrBack; int _mergeX; private: diff --git a/engines/xeen/worldofxeen/darkside_cutscenes.h b/engines/xeen/worldofxeen/darkside_cutscenes.h index 1808562b11..aee27e89a5 100644 --- a/engines/xeen/worldofxeen/darkside_cutscenes.h +++ b/engines/xeen/worldofxeen/darkside_cutscenes.h @@ -33,6 +33,7 @@ namespace WorldOfXeen { class DarkSideCutscenes : public Cutscenes { private: + Subtitles _subtitles; SpriteResource _ball, _claw, _dragon1; private: /** diff --git a/engines/xeen/worldofxeen/worldofxeen_cutscenes.h b/engines/xeen/worldofxeen/worldofxeen_cutscenes.h index 47716e5012..5725c7dd2f 100644 --- a/engines/xeen/worldofxeen/worldofxeen_cutscenes.h +++ b/engines/xeen/worldofxeen/worldofxeen_cutscenes.h @@ -38,6 +38,7 @@ class WorldOfXeenCutscenes : public CloudsCutscenes, public DarkSideCutscenes { private: XeenEngine *_vm; + Subtitles _subtitles; GooberState _goober; uint _finalScore; private: |