diff options
| -rw-r--r-- | engines/simon/simon.cpp | 2 | ||||
| -rw-r--r-- | engines/simon/simon.h | 2 | ||||
| -rw-r--r-- | engines/simon/verb.cpp | 2 | ||||
| -rw-r--r-- | engines/simon/vga.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp index 518ce700ad..1fd7ba4ea0 100644 --- a/engines/simon/simon.cpp +++ b/engines/simon/simon.cpp @@ -1779,7 +1779,7 @@ void SimonEngine::handleMouseMoved() { goto get_out; } - setup_hitarea_from_pos(_mouseX, _mouseY, x); + boxController(_mouseX, _mouseY, x); _lastHitArea3 = _lastHitArea; if (x == 1 && _lastHitArea == NULL) _lastHitArea3 = (HitArea *) -1; diff --git a/engines/simon/simon.h b/engines/simon/simon.h index a06581ac1b..117508c184 100644 --- a/engines/simon/simon.h +++ b/engines/simon/simon.h @@ -651,7 +651,7 @@ protected: uint getWindowNum(WindowBlock *window); - void setup_hitarea_from_pos(uint x, uint y, uint mode); + void boxController(uint x, uint y, uint mode); void displayName(HitArea * ha); void displayBoxStars(); void hitarea_stuff(); diff --git a/engines/simon/verb.cpp b/engines/simon/verb.cpp index 2db947a588..a05cb6f442 100644 --- a/engines/simon/verb.cpp +++ b/engines/simon/verb.cpp @@ -634,7 +634,7 @@ void SimonEngine::inventoryDown(WindowBlock *window) { } } -void SimonEngine::setup_hitarea_from_pos(uint x, uint y, uint mode) { +void SimonEngine::boxController(uint x, uint y, uint mode) { HitArea *best_ha; HitArea *ha = _hitAreas; uint count = ARRAYSIZE(_hitAreas); diff --git a/engines/simon/vga.cpp b/engines/simon/vga.cpp index edf531da8f..a6856240d6 100644 --- a/engines/simon/vga.cpp +++ b/engines/simon/vga.cpp @@ -2427,7 +2427,7 @@ void SimonEngine::vc79_computePosNum() { uint pos = 0; uint16 y = vcReadVar(16); - while(y > readUint16Wrapper(p + 1)) { + while (y >= readUint16Wrapper(p + 1)) { p += 2; pos++; } |