diff options
| author | Paul Gilbert | 2018-03-11 21:28:11 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2018-03-11 21:28:11 -0400 |
| commit | 4a5c1af79f863992452344f7d02e58ef359c4ddd (patch) | |
| tree | 09279e38772143d57014f3acb3d3b086b5f48a4d /engines/xeen/worldofxeen | |
| parent | 392db4ed338e95158931c630a9c71ced0c903765 (diff) | |
| download | scummvm-rg350-4a5c1af79f863992452344f7d02e58ef359c4ddd.tar.gz scummvm-rg350-4a5c1af79f863992452344f7d02e58ef359c4ddd.tar.bz2 scummvm-rg350-4a5c1af79f863992452344f7d02e58ef359c4ddd.zip | |
XEEN: Refactoring subtitles for use in location cutscenes, updated Reaper cutscene
Diffstat (limited to 'engines/xeen/worldofxeen')
| -rw-r--r-- | engines/xeen/worldofxeen/clouds_cutscenes.cpp | 1 | ||||
| -rw-r--r-- | engines/xeen/worldofxeen/clouds_cutscenes.h | 2 | ||||
| -rw-r--r-- | engines/xeen/worldofxeen/darkside_cutscenes.cpp | 2 | ||||
| -rw-r--r-- | engines/xeen/worldofxeen/worldofxeen_cutscenes.cpp | 2 |
4 files changed, 6 insertions, 1 deletions
diff --git a/engines/xeen/worldofxeen/clouds_cutscenes.cpp b/engines/xeen/worldofxeen/clouds_cutscenes.cpp index 78e85ba62e..ead66fa501 100644 --- a/engines/xeen/worldofxeen/clouds_cutscenes.cpp +++ b/engines/xeen/worldofxeen/clouds_cutscenes.cpp @@ -27,6 +27,7 @@ namespace Xeen { namespace WorldOfXeen { +#define WAIT(TIME) if (_subtitles.wait(TIME)) return false #define ROTATE_BG screen.horizMerge(_mergeX); \ _mergeX = (_mergeX + 1) % SCREEN_WIDTH #define LOAD_VORTEX loadScreen(Common::String::format("vort%02u.frm", cloudsCtr)); \ diff --git a/engines/xeen/worldofxeen/clouds_cutscenes.h b/engines/xeen/worldofxeen/clouds_cutscenes.h index 17cd6d3f08..39fded63ea 100644 --- a/engines/xeen/worldofxeen/clouds_cutscenes.h +++ b/engines/xeen/worldofxeen/clouds_cutscenes.h @@ -39,7 +39,7 @@ private: static const byte _DECODE_TABLE1[256]; static const byte _DECODE_TABLE2[256]; private: - CloudsSubtitles _subtitles; + Subtitles _subtitles; SpriteResource _mirror, _mirrBack; int _mergeX; private: diff --git a/engines/xeen/worldofxeen/darkside_cutscenes.cpp b/engines/xeen/worldofxeen/darkside_cutscenes.cpp index e37cbec7fc..be8b5cf62c 100644 --- a/engines/xeen/worldofxeen/darkside_cutscenes.cpp +++ b/engines/xeen/worldofxeen/darkside_cutscenes.cpp @@ -26,6 +26,8 @@ #include "xeen/worldofxeen/worldofxeen.h" #include "xeen/worldofxeen/worldofxeen_resources.h" +#define WAIT(TIME) if (_subtitles.wait(TIME)) return false + namespace Xeen { namespace WorldOfXeen { diff --git a/engines/xeen/worldofxeen/worldofxeen_cutscenes.cpp b/engines/xeen/worldofxeen/worldofxeen_cutscenes.cpp index 13d59c43c9..9d35733de9 100644 --- a/engines/xeen/worldofxeen/worldofxeen_cutscenes.cpp +++ b/engines/xeen/worldofxeen/worldofxeen_cutscenes.cpp @@ -24,6 +24,8 @@ #include "xeen/sound.h" #include "xeen/xeen.h" +#define WAIT(TIME) if (_subtitles.wait(TIME)) return false + namespace Xeen { namespace WorldOfXeen { |