ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs:

Browse Source 
FT: Stadium Salesman Glitches
COMI: Wally's Fake piratehook still on ground after pick up

svn-id: r14221
This commit is contained in:
Travis Howell
2004-07-16 03:39:23 +00:00
parent efbd2fe42f
commit bd8c7f08f6
4 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scumm/string.cpp
+5 -1
View File
@@ -143,7 +143,7 @@ void ScummEngine::CHARSET_1() {
if (_talkDelay)
return;
if (_haveMsg == 1) {
if ((_version <= 7 && _haveMsg == 1) || (_version == 8 && VAR(VAR_HAVE_MSG))) {
if ((_sound->_sfxMode & 2) == 0)
stopTalk();
return;
@@ -307,6 +307,10 @@ void ScummEngine::CHARSET_1() {
_charsetBufPos = buffer - _charsetBuffer;
// TODO Verify this is correct spot
if (_version == 8)
VAR(VAR_HAVE_MSG) = (_string[0].no_talk_anim) ? 2 : 1;
// FIXME: Remove this and the next two lines eventually!
if (_charset->_hasMask != (_charset->_str.left != -1))
warning("_hasMask mismatch (case A %d) - please report to Fingolfin if you notice any text/graphics glitches related to this!", _charset->_hasMask);