diff options
| author | Paul Gilbert | 2017-11-19 15:29:51 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-11-19 15:29:51 -0500 |
| commit | fb9d813ef45d5fa3e70e6620f1ef8347a3cd0221 (patch) | |
| tree | a0eaa6d3a73298591fe91e931971cbad643c75b9 /engines | |
| parent | 0878d8f573aecde6d8387ce6095c7ec8cc2d34dc (diff) | |
| download | scummvm-rg350-fb9d813ef45d5fa3e70e6620f1ef8347a3cd0221.tar.gz scummvm-rg350-fb9d813ef45d5fa3e70e6620f1ef8347a3cd0221.tar.bz2 scummvm-rg350-fb9d813ef45d5fa3e70e6620f1ef8347a3cd0221.zip | |
XEEN: Cleaner implementation of changing script line number
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/xeen/scripts.cpp | 44 |
1 files changed, 28 insertions, 16 deletions
diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp index a78bc23301..2d0123e407 100644 --- a/engines/xeen/scripts.cpp +++ b/engines/xeen/scripts.cpp @@ -412,8 +412,10 @@ bool Scripts::cmdNPC(Common::Array<byte> ¶ms) { Map &map = *_vm->_map; if (TownMessage::show(_vm, params[2], _message, map._events._text[params[1]], - params[3])) - _lineNum = params[4] - 1; + params[3])) { + _lineNum = params[4]; + return false; + } return true; } @@ -528,8 +530,10 @@ bool Scripts::cmdIf(Common::Array<byte> ¶ms) { } } - if (result) - _lineNum = newLineNum - 1; + if (result) { + _lineNum = newLineNum; + return false; + } return true; } @@ -863,8 +867,10 @@ bool Scripts::cmdGiveExtended(Common::Array<byte> ¶ms) { } } - if (result) - _lineNum = newLineNum - 1; + if (result) { + _lineNum = newLineNum; + return false; + } return true; } @@ -938,8 +944,10 @@ bool Scripts::cmdDamage(Common::Array<byte> ¶ms) { bool Scripts::cmdJumpRnd(Common::Array<byte> ¶ms) { int v = _vm->getRandomNumber(1, params[0]); - if (v == params[1]) - _lineNum = params[2] - 1; + if (v == params[1]) { + _lineNum = params[2]; + return false; + } return true; } @@ -963,9 +971,9 @@ bool Scripts::cmdAlterEvent(Common::Array<byte> ¶ms) { bool Scripts::cmdCallEvent(Common::Array<byte> ¶ms) { _stack.push(StackEntry(_currentPos, _lineNum)); _currentPos = Common::Point(params[0], params[1]); - _lineNum = params[2] - 1; + _lineNum = params[2]; - return true; + return false; } bool Scripts::cmdReturn(Common::Array<byte> ¶ms) { @@ -1116,7 +1124,8 @@ bool Scripts::cmdIfMapFlag(Common::Array<byte> ¶ms) { MazeMonster &monster = map._mobData._monsters[params[0]]; if (monster._position.x >= 32 || monster._position.y >= 32) { - _lineNum = params[1] - 1; + _lineNum = params[1]; + return false; } return true; @@ -1220,7 +1229,8 @@ bool Scripts::cmdCheckProtection(Common::Array<byte> ¶ms) { bool Scripts::cmdChooseNumeric(Common::Array<byte> ¶ms) { int choice = Choose123::show(_vm, params[0]); if (choice) { - _lineNum = params[choice] - 1; + _lineNum = params[choice]; + return false; } return true; @@ -1282,15 +1292,17 @@ bool Scripts::cmdDisplayMain(Common::Array<byte> ¶ms) { bool Scripts::cmdGoto(Common::Array<byte> ¶ms) { Map &map = *_vm->_map; map.getCell(1); - if (params[0] == map._currentSurfaceId) - _lineNum = params[1] - 1; + if (params[0] == map._currentSurfaceId) { + _lineNum = params[1]; + return false; + } return true; } bool Scripts::cmdGotoRandom(Common::Array<byte> ¶ms) { - _lineNum = params[_vm->getRandomNumber(1, params[0])] - 1; - return true; + _lineNum = params[_vm->getRandomNumber(1, params[0])]; + return false; } bool Scripts::cmdCutsceneEndDarkside(Common::Array<byte> ¶ms) { |