diff options
Diffstat (limited to 'string.cpp')
| -rw-r--r-- | string.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/string.cpp b/string.cpp index c63c4af744..0f91f9416e 100644 --- a/string.cpp +++ b/string.cpp @@ -191,14 +191,15 @@ void Scumm::CHARSET_1() { Actor *a; byte *buffer; -#if !defined(FULL_THROTTLE) - if (!_haveMsg || (camera._dest.x>>3) != (camera._cur.x>>3) || - camera._cur.x != camera._last.x - ) return; -#else - if (!_haveMsg) - return; -#endif + if(!(_features & GF_AFTER_V7)) { + if (!_haveMsg || (camera._dest.x>>3) != (camera._cur.x>>3) || + camera._cur.x != camera._last.x + ) return; + } else { + if (!_haveMsg) + return; + } + a = NULL; if (_vars[VAR_TALK_ACTOR] != 0xFF) a = derefActorSafe(_vars[VAR_TALK_ACTOR], "CHARSET_1"); |