diff options
| author | Strangerke | 2013-09-11 21:33:10 +0200 |
|---|---|---|
| committer | Strangerke | 2013-09-11 21:33:10 +0200 |
| commit | da1a427e794434a09cd39ab45e32ae7afca9a170 (patch) | |
| tree | 85b4700515bc7853e4f90ddae22bc3b785c4ab3a /engines/drascula/interface.cpp | |
| parent | 49dbac6a2a5cde294a4c4c9a47467e7b5d95e08b (diff) | |
| parent | 5c6ee7573c0cf05bbbb154d4734e94e478f453e5 (diff) | |
| download | scummvm-rg350-da1a427e794434a09cd39ab45e32ae7afca9a170.tar.gz scummvm-rg350-da1a427e794434a09cd39ab45e32ae7afca9a170.tar.bz2 scummvm-rg350-da1a427e794434a09cd39ab45e32ae7afca9a170.zip | |
Merge branch 'master' of https://github.com/urukgit/scummvm into avalanche
Diffstat (limited to 'engines/drascula/interface.cpp')
| -rw-r--r-- | engines/drascula/interface.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/drascula/interface.cpp b/engines/drascula/interface.cpp index fca8040f59..f0b6d12027 100644 --- a/engines/drascula/interface.cpp +++ b/engines/drascula/interface.cpp @@ -51,7 +51,7 @@ bool DrasculaEngine::isCursorVisible() { void DrasculaEngine::selectVerbFromBar() { for (int n = 0; n < 7; n++) { - if (mouseX > _verbBarX[n] && mouseX < _verbBarX[n + 1] && n > 0) { + if (_mouseX > _verbBarX[n] && _mouseX < _verbBarX[n + 1] && n > 0) { selectVerb(n); return; } @@ -143,7 +143,7 @@ void DrasculaEngine::clearMenu() { int n, verbActivated = 1; for (n = 0; n < 7; n++) { - if (mouseX > _verbBarX[n] && mouseX < _verbBarX[n + 1]) + if (_mouseX > _verbBarX[n] && _mouseX < _verbBarX[n + 1]) verbActivated = 0; copyRect(OBJWIDTH * n, OBJHEIGHT * verbActivated, _verbBarX[n], 2, OBJWIDTH, OBJHEIGHT, cursorSurface, screenSurface); @@ -165,8 +165,8 @@ void DrasculaEngine::showMap() { _hasName = false; for (int l = 0; l < numRoomObjs; l++) { - if (mouseX > _objectX1[l] && mouseY > _objectY1[l] - && mouseX < _objectX2[l] && mouseY < _objectY2[l] + if (_mouseX > _objectX1[l] && _mouseY > _objectY1[l] + && _mouseX < _objectX2[l] && _mouseY < _objectY2[l] && visible[l] == 1) { strcpy(textName, objName[l]); _hasName = true; |