diff options
| author | Torbjörn Andersson | 2013-01-23 21:44:31 +0100 |
|---|---|---|
| committer | Torbjörn Andersson | 2013-01-23 21:44:31 +0100 |
| commit | efe910d6893ae680f35647b6a3a1e4043bfdb8fa (patch) | |
| tree | 7cbb5e7b4922b5f3974e0628712a5e320b7c33d4 | |
| parent | 668f2ddad793ee0e4ae5de4571ceffbc64a3a241 (diff) | |
| download | scummvm-rg350-efe910d6893ae680f35647b6a3a1e4043bfdb8fa.tar.gz scummvm-rg350-efe910d6893ae680f35647b6a3a1e4043bfdb8fa.tar.bz2 scummvm-rg350-efe910d6893ae680f35647b6a3a1e4043bfdb8fa.zip | |
HOPKINS: Fix GCC warnings
| -rw-r--r-- | engines/hopkins/lines.cpp | 2 | ||||
| -rw-r--r-- | engines/hopkins/objects.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/hopkins/lines.cpp b/engines/hopkins/lines.cpp index 6fc9436a7a..2791113c2f 100644 --- a/engines/hopkins/lines.cpp +++ b/engines/hopkins/lines.cpp @@ -2984,7 +2984,7 @@ int LinesManager::SMOOTH_MOVE(int a3, int a4, int a5, int a6) { } } else if (a3 < a5 && a6 < a4) { v50 = 12; - int smoothIdx = 0; + smoothIdx = 0; int loopCount = 0; while (v62 < a5 && a6 < v63) { v6 = _vm->_globals.Hopkins[v50].field2; diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp index 0c76c56357..380e764dd8 100644 --- a/engines/hopkins/objects.cpp +++ b/engines/hopkins/objects.cpp @@ -1392,7 +1392,7 @@ void ObjectsManager::GOHOME() { computeAndSetSpriteSize(); newPosX = *_vm->_globals.chemin++; newPosY = *_vm->_globals.chemin++; - int newDirection = *_vm->_globals.chemin++; + newDirection = *_vm->_globals.chemin++; _vm->_globals.chemin++; if (newPosX != -1 || newPosY != -1) { @@ -2522,7 +2522,7 @@ int16 *ObjectsManager::cityMapCarRoute(int x1, int y1, int x2, int y2) { break; arrDataIdx[7] = 0; arrLineIdx[7] = -1; - if ((arrDelta[1] <= delta && arrLineIdx[1] != -1) || arrDelta[3] <= delta && arrLineIdx[3] != -1 || arrDelta[5] <= delta && arrLineIdx[5] != -1) + if ((arrDelta[1] <= delta && arrLineIdx[1] != -1) || (arrDelta[3] <= delta && arrLineIdx[3] != -1) || (arrDelta[5] <= delta && arrLineIdx[5] != -1)) break; } arrDelta[7] = delta; |