diff options
| author | Willem Jan Palenstijn | 2013-02-19 00:52:48 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-02-19 00:52:48 +0100 |
| commit | 71f70158e77201bdc42d3393fa11f78fe4e98ce0 (patch) | |
| tree | c1c88712f83a029e8c6c81bf3831ca0b47f22888 /engines/hopkins/lines.cpp | |
| parent | 95c44e0a515b316bcdfce6c251d96b2d95d38113 (diff) | |
| download | scummvm-rg350-71f70158e77201bdc42d3393fa11f78fe4e98ce0.tar.gz scummvm-rg350-71f70158e77201bdc42d3393fa11f78fe4e98ce0.tar.bz2 scummvm-rg350-71f70158e77201bdc42d3393fa11f78fe4e98ce0.zip | |
HOPKINS: Fix repeating route from pathfinder
Regression from d7c8fe912.
Diffstat (limited to 'engines/hopkins/lines.cpp')
| -rw-r--r-- | engines/hopkins/lines.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/engines/hopkins/lines.cpp b/engines/hopkins/lines.cpp index 3a7bc99f08..26419cd16b 100644 --- a/engines/hopkins/lines.cpp +++ b/engines/hopkins/lines.cpp @@ -1474,17 +1474,19 @@ RouteItem *LinesManager::PARCOURS2(int fromX, int fromY, int destX, int destY) { } } } - if (!loopCond) { - int v89 = PARC_PERS(v119, v118, clipDestX, clipDestY, v117, v121, v112); - if (v89 == 1) - return &super_parcours[0]; - if (v89 == 2 || MIRACLE(v119, v118, v117, v121, v112)) { - v115 = NV_LIGNEDEP; - v114 = NV_LIGNEOFS; - v112 = NV_POSI; - loopCond = true; - break; - } + + if (loopCond) + break; + + int v89 = PARC_PERS(v119, v118, clipDestX, clipDestY, v117, v121, v112); + if (v89 == 1) + return &super_parcours[0]; + if (v89 == 2 || MIRACLE(v119, v118, v117, v121, v112)) { + v115 = NV_LIGNEDEP; + v114 = NV_LIGNEOFS; + v112 = NV_POSI; + loopCond = true; + break; } } |