diff options
| author | Travis Howell | 2004-02-20 15:04:51 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-02-20 15:04:51 +0000 |
| commit | f1b5b8fa2438d5fb6e0957bc015640a015a954e3 (patch) | |
| tree | 7052e89738614d7a21e7c3b1f910d4fb4ed7ba65 /scumm | |
| parent | 1fe7d0c8902f33ded8fa847c3072d4130af20fd9 (diff) | |
| download | scummvm-rg350-f1b5b8fa2438d5fb6e0957bc015640a015a954e3.tar.gz scummvm-rg350-f1b5b8fa2438d5fb6e0957bc015640a015a954e3.tar.bz2 scummvm-rg350-f1b5b8fa2438d5fb6e0957bc015640a015a954e3.zip | |
Variable should be checked at this point.
svn-id: r12942
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/scumm.h | 2 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 4 | ||||
| -rw-r--r-- | scumm/vars.cpp | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h index 3da2f48a3c..d3794445d2 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -1221,6 +1221,8 @@ public: byte VAR_ACTIVE_OBJECT1; byte VAR_ACTIVE_OBJECT2; byte VAR_CLICK_AREA; + + byte VAR_BLAST_ABOVE_TEXT; }; // This is a constant lookup table of reverse bit masks diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index c56bf38a17..770ae991ef 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -617,6 +617,8 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS VAR_VERB_ALLOWED = 0xFF; VAR_CLICK_AREA = 0xFF; + VAR_BLAST_ABOVE_TEXT = 0xFF; + // Use g_scumm from error() ONLY g_scumm = this; @@ -1512,7 +1514,7 @@ load_game: // texts have to be drawn before the blast objects. Unless // someone can think of a better way to achieve this effect. - if (_gameId == GID_FT) { + if (_version >= 7 && VAR(VAR_BLAST_ABOVE_TEXT) == 1) { drawBlastTexts(); drawBlastObjects(); } else { diff --git a/scumm/vars.cpp b/scumm/vars.cpp index 1508f0cd2d..8ab56e2d7c 100644 --- a/scumm/vars.cpp +++ b/scumm/vars.cpp @@ -241,6 +241,7 @@ void ScummEngine_v7::setupScummVars() { VAR_CHARSET_MASK = 119; VAR_VIDEONAME = 123; VAR_CUSTOMSCALETABLE = 131; + VAR_BLAST_ABOVE_TEXT = 133; VAR_STRING2DRAW = 130; } @@ -320,6 +321,8 @@ void ScummEngine_v8::setupScummVars() { VAR_CAMERA_THRESHOLD_X = 124; VAR_CAMERA_THRESHOLD_Y = 125; + VAR_BLAST_ABOVE_TEXT = 133; + VAR_EGO = 126; VAR_DEBUGMODE = 130; |