diff options
| author | johndoe123 | 2012-05-11 11:03:40 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:43:38 +0200 |
| commit | 0683ed9eee35a465b7b3fd5b36f55011123aee65 (patch) | |
| tree | eeca173b764013ad6b64d4511963f757e4efd999 /engines/neverhood/scene.cpp | |
| parent | 9c2341678ef4984bf92b3878295250faf980b066 (diff) | |
| download | scummvm-rg350-0683ed9eee35a465b7b3fd5b36f55011123aee65.tar.gz scummvm-rg350-0683ed9eee35a465b7b3fd5b36f55011123aee65.tar.bz2 scummvm-rg350-0683ed9eee35a465b7b3fd5b36f55011123aee65.zip | |
NEVERHOOD: Rename SetSpriteCallback to SetSpriteUpdate
- Started replace message numbers with constants
- Add NRect::contains
- Some cleanup
Diffstat (limited to 'engines/neverhood/scene.cpp')
| -rw-r--r-- | engines/neverhood/scene.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/engines/neverhood/scene.cpp b/engines/neverhood/scene.cpp index 9a588f283f..457d5866d0 100644 --- a/engines/neverhood/scene.cpp +++ b/engines/neverhood/scene.cpp @@ -387,13 +387,11 @@ bool Scene::queryPositionRectList(int16 mouseX, int16 mouseY) { if (_rectType == 1) { RectList &rectList = *_rectList; for (uint i = 0; i < rectList.size(); i++) { - debug("(%d, %d) ? (%d, %d, %d, %d)", klaymanX, klaymanY, rectList[i].rect.x1, rectList[i].rect.y1, rectList[i].rect.x2, rectList[i].rect.y2); - if (klaymanX >= rectList[i].rect.x1 && klaymanX <= rectList[i].rect.x2 && - klaymanY >= rectList[i].rect.y1 && klaymanY <= rectList[i].rect.y2) { + debug(2, "(%d, %d) ? (%d, %d, %d, %d)", klaymanX, klaymanY, rectList[i].rect.x1, rectList[i].rect.y1, rectList[i].rect.x2, rectList[i].rect.y2); + if (rectList[i].rect.contains(klaymanX, klaymanY)) { for (uint j = 0; j < rectList[i].subRects.size(); j++) { - debug(" (%d, %d) ? (%d, %d, %d, %d)", mouseX, mouseY, rectList[i].subRects[j].rect.x1, rectList[i].subRects[j].rect.y1, rectList[i].subRects[j].rect.x2, rectList[i].subRects[j].rect.y2); - if (mouseX >= rectList[i].subRects[j].rect.x1 && mouseX <= rectList[i].subRects[j].rect.x2 && - mouseY >= rectList[i].subRects[j].rect.y1 && mouseY <= rectList[i].subRects[j].rect.y2) { + debug(2, " (%d, %d) ? (%d, %d, %d, %d)", mouseX, mouseY, rectList[i].subRects[j].rect.x1, rectList[i].subRects[j].rect.y1, rectList[i].subRects[j].rect.x2, rectList[i].subRects[j].rect.y2); + if (rectList[i].subRects[j].rect.contains(mouseX, mouseY)) { debug("Scene::queryPositionRectList() -> %08X", rectList[i].subRects[j].messageListId); return setMessageList2(rectList[i].subRects[j].messageListId); } |