diff options
author | lukaslw | 2014-07-25 15:21:31 +0200 |
---|---|---|
committer | lukaslw | 2014-07-25 15:21:31 +0200 |
commit | 2a1b354a6df3b3d7322561b8d62f7c5626230838 (patch) | |
tree | c033cdabf147377af58128b78602d616bbafc264 /engines/prince/hero.cpp | |
parent | 98dafb866709273ffa984b6f709b94fbdab1e912 (diff) | |
download | scummvm-rg350-2a1b354a6df3b3d7322561b8d62f7c5626230838.tar.gz scummvm-rg350-2a1b354a6df3b3d7322561b8d62f7c5626230838.tar.bz2 scummvm-rg350-2a1b354a6df3b3d7322561b8d62f7c5626230838.zip |
PRINCE: Hero bored timer - update
Diffstat (limited to 'engines/prince/hero.cpp')
-rw-r--r-- | engines/prince/hero.cpp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/engines/prince/hero.cpp b/engines/prince/hero.cpp index 5edbed5df7..a0e7533c69 100644 --- a/engines/prince/hero.cpp +++ b/engines/prince/hero.cpp @@ -736,17 +736,21 @@ void Hero::showHero() { } if (_state == STAY) { - if (!_vm->_optionsFlag && !_vm->_interpreter->getLastOPCode()) { // TODO - check OPCODE after right click - _boredomTime++; - if (_boredomTime == _maxBoredom) { - _boreNum =_vm->_randomSource.getRandomNumber(1); // rand one of two 'bored' animation - _phase = 0; - _state = BORE; - if (_lastDirection == kHeroDirUp) { - _lastDirection = kHeroDirLeft; - } else { - _lastDirection = kHeroDirDown; + if (!_vm->_optionsFlag) { + if (!_vm->_interpreter->getLastOPCode() || !_vm->_interpreter->getFgOpcodePC()) { + _boredomTime++; + if (_boredomTime == _maxBoredom) { + _boreNum =_vm->_randomSource.getRandomNumber(1); // rand one of two 'bored' animation + _phase = 0; + _state = BORE; + if (_lastDirection == kHeroDirUp) { + _lastDirection = kHeroDirLeft; + } else { + _lastDirection = kHeroDirDown; + } } + } else { + _boredomTime = 0; } } else { _boredomTime = 0; |