diff options
| author | Paul Gilbert | 2013-06-30 10:02:37 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2013-06-30 10:02:37 -0400 |
| commit | 755f6c30a26cb3de583fcb917db36f4b4f07aa5c (patch) | |
| tree | 6446c7c5df2a0a0ce3af08d58f0b57bc3bc2ff09 | |
| parent | 45ea2e0979d6329e5e978dda6438d3154956c6ac (diff) | |
| download | scummvm-rg350-755f6c30a26cb3de583fcb917db36f4b4f07aa5c.tar.gz scummvm-rg350-755f6c30a26cb3de583fcb917db36f4b4f07aa5c.tar.bz2 scummvm-rg350-755f6c30a26cb3de583fcb917db36f4b4f07aa5c.zip | |
TSAGE: Fix moving past intersection in R2R scene 3500 maze
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes3.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp index 55303cfa42..4590ad9581 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp @@ -3824,7 +3824,7 @@ void Scene3500::dispatch() { newMazeX = _mazePosition.x; newMazeY = _mazePosition.y; - var_4 = _mazeUI.cellFromX(70) - 70; + var_4 = _mazeUI.cellFromX(newMazeX + 70) - 70; var_6 = _mazeUI.cellFromY(_mazePosition.y + 46) - 46; var_8 = abs(var_4 - newMazeX); var_a = abs(var_6 - newMazeY); @@ -3833,8 +3833,8 @@ void Scene3500::dispatch() { switch (_field1276 - 1) { case 0: cellId = _mazeUI.getCellFromMapXY(Common::Point(newMazeX + 70, newMazeY + 46)); - if ( ((cellId == 2) || (cellId == 3) || (cellId == 6) || (cellId == 1)) - || (((cellId == 25) || (cellId == 26) || (cellId == 5) || (cellId == 14) || (cellId == 15)) && (var_8 > 3)) ) { + if (((cellId == 2) || (cellId == 3) || (cellId == 6) || (cellId == 1)) || + ((cellId == 25 || cellId == 26 || cellId == 5 || cellId == 14 || cellId == 15) && var_8 > 3)) { R2_GLOBALS._sound2.play(339); _rotation->_idxChange = 0; _field1270 = 0; |