Ticket #8078: ft-dialogue.diff

File ft-dialogue.diff, 1.3 KB (added by eriktorbjorn, 22 years ago)

Patch against an October 2 CVS snapshot

  • scummvm/scumm/scummvm.cpp

    diff -ur ScummVM-cvs20021002/scummvm/scumm/scummvm.cpp ScummVM-cvs20021002+hack/scummvm/scumm/scummvm.cpp
    old new  
    374374
    375375        decreaseScriptDelay(delta);
    376376
    377         _talkDelay -= delta;
    378         if (_talkDelay < 0)
    379                 _talkDelay = 0;
     377        // If _talkDelay is -1, that means the text should never time out.
     378        // This is used for drawing verb texts, e.g. the Full Throttle
     379        // dialogue choices.
     380
     381        if (_talkDelay != -1) {
     382                _talkDelay -= delta;
     383                if (_talkDelay < 0)
     384                        _talkDelay = 0;
     385        }
    380386
    381387        processKbd();
    382388
  • scummvm/scumm/string.cpp

    diff -ur ScummVM-cvs20021002/scummvm/scumm/string.cpp ScummVM-cvs20021002+hack/scummvm/scumm/string.cpp
    old new  
    560560                charset._left -= charset.getStringWidth(a, buf, 0) >> 1;
    561561        }
    562562
    563         // Full Throttle's conversation menus should definitely mask the
    564         // background.
    565563        if (!(_features & GF_AFTER_V7))
    566564                charset._ignoreCharsetMask = 1;
    567565
     566        // Verb text should never time out.
     567        if (a == 4)
     568                _talkDelay = -1;
     569
    568570        if (!buf[0]) {
    569571                buf[0] = ' ';
    570572                buf[1] = 0;