diff options
| author | Paul Gilbert | 2012-10-14 19:41:22 +1100 |
|---|---|---|
| committer | Paul Gilbert | 2012-10-14 19:41:22 +1100 |
| commit | 4e16b2e81d2f36eb76bba27dfbfff031e8e46813 (patch) | |
| tree | b1cddd59578aef603aadfdb3e42d237049a1f56f /engines/hopkins | |
| parent | af2824da8247c699c29a566bce1facb76d4b5877 (diff) | |
| download | scummvm-rg350-4e16b2e81d2f36eb76bba27dfbfff031e8e46813.tar.gz scummvm-rg350-4e16b2e81d2f36eb76bba27dfbfff031e8e46813.tar.bz2 scummvm-rg350-4e16b2e81d2f36eb76bba27dfbfff031e8e46813.zip | |
HOPKINS: Minor bugfix for colision method
Diffstat (limited to 'engines/hopkins')
| -rw-r--r-- | engines/hopkins/objects.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp index f128742eef..3578df160a 100644 --- a/engines/hopkins/objects.cpp +++ b/engines/hopkins/objects.cpp @@ -4276,7 +4276,7 @@ int ObjectsManager::MZONE() { } if (v19 == -1) goto LABEL_58; - for (j = yp; _vm->_graphicsManager.max_y > j; ++j) { + for (j = yp; j < _vm->_graphicsManager.max_y; ++j) { v18 = colision(xp, j); if (v18 != -1 && _vm->_globals.ZONEP[v19].field10 == 1) break; @@ -7876,7 +7876,7 @@ int ObjectsManager::colision(int xp, int yp) { flag = false; if (v1 >= v3 && (xMin > v1 || xMax < v3)) flag = false; - if (v2 < v4 && (v2 < yMax || yMin > v4)) + if (v2 < v4 && (yMax < v2 || yMin > v4)) flag = false; if (v2 >= v4 && (yMin > v2 || yMax < v4)) flag = false; |