diff options
| author | Strangerke | 2017-01-14 00:32:56 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-01-25 22:42:22 +0100 |
| commit | 9c52ea3b268669e16487baf655f8d7f04db53e61 (patch) | |
| tree | dfd5c833f23fc4591c3a777676894d5a910f7ee1 /engines/cryo | |
| parent | 3ad086ed70bdf09a7421fb4627f0c9fa94529086 (diff) | |
| download | scummvm-rg350-9c52ea3b268669e16487baf655f8d7f04db53e61.tar.gz scummvm-rg350-9c52ea3b268669e16487baf655f8d7f04db53e61.tar.bz2 scummvm-rg350-9c52ea3b268669e16487baf655f8d7f04db53e61.zip | |
CRYO: Remove a GOTO
Diffstat (limited to 'engines/cryo')
| -rw-r--r-- | engines/cryo/eden.cpp | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/engines/cryo/eden.cpp b/engines/cryo/eden.cpp index 610694ac83..83f59026f5 100644 --- a/engines/cryo/eden.cpp +++ b/engines/cryo/eden.cpp @@ -2001,32 +2001,31 @@ void EdenGame::moveDino(perso_t *perso) { if (dir2 & 0x80) dir2 = -(dir2 & ~0x80); dir2 += loc; - if (canMoveThere(dir2, perso)) - goto ok; - dir2 = *dirs++; - if (dir2 & 0x80) - dir2 = -(dir2 & ~0x80); - dir2 += loc; - if (canMoveThere(dir2, perso)) - goto ok; - dir2 = *dirs++; - if (dir2 & 0x80) - dir2 = -(dir2 & ~0x80); - dir2 += loc; - if (canMoveThere(dir2, perso)) - goto ok; - dir2 = *dirs++; - if (dir2 & 0x80) - dir2 = -(dir2 & ~0x80); - dir2 += loc; - if (canMoveThere(dir2, perso)) - goto ok; - dir2 = perso->_lastLoc; - perso->_lastLoc = 0; - if (!canMoveThere(dir2, perso)) - return; - ok: - ; + if (!canMoveThere(dir2, perso)) { + dir2 = *dirs++; + if (dir2 & 0x80) + dir2 = -(dir2 & ~0x80); + dir2 += loc; + if (!canMoveThere(dir2, perso)) { + dir2 = *dirs++; + if (dir2 & 0x80) + dir2 = -(dir2 & ~0x80); + dir2 += loc; + if (!canMoveThere(dir2, perso)) { + dir2 = *dirs++; + if (dir2 & 0x80) + dir2 = -(dir2 & ~0x80); + dir2 += loc; + if (!canMoveThere(dir2, perso)) { + dir2 = perso->_lastLoc; + perso->_lastLoc = 0; + if (!canMoveThere(dir2, perso)) + return; + } + } + } + } + perso->_lastLoc = perso->_roomNum & 0xFF; perso->_roomNum &= ~0xFF; perso->_roomNum |= dir2 & 0xFF; |