aboutsummaryrefslogtreecommitdiff
path: root/verbs.cpp
diff options
context:
space:
mode:
authorLudvig Strigeus2001-11-14 20:09:39 +0000
committerLudvig Strigeus2001-11-14 20:09:39 +0000
commit88dcec7cdb16413e877b42c9a3b5d96631b37c31 (patch)
tree67451c80d768010be21337fe4eee5d9770bf7eef /verbs.cpp
parent8ae567b094b798625ffc9e4870086d8faf19c542 (diff)
downloadscummvm-rg350-88dcec7cdb16413e877b42c9a3b5d96631b37c31.tar.gz
scummvm-rg350-88dcec7cdb16413e877b42c9a3b5d96631b37c31.tar.bz2
scummvm-rg350-88dcec7cdb16413e877b42c9a3b5d96631b37c31.zip
readability patch (janssen)
svn-id: r3493
Diffstat (limited to 'verbs.cpp')
-rw-r--r--verbs.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/verbs.cpp b/verbs.cpp
index a4c742af37..72f530804b 100644
--- a/verbs.cpp
+++ b/verbs.cpp
@@ -36,7 +36,7 @@ void Scumm::checkExecVerbs() {
if (_userPut<=0 || _mouseButStat==0)
return;
- if (_mouseButStat < 0x200) {
+ if (_mouseButStat < MBS_MAX_KEY) {
/* Check keypresses */
vs = &_verbs[1];
for (i=1; i<_maxVerbs; i++,vs++) {
@@ -48,8 +48,8 @@ void Scumm::checkExecVerbs() {
}
}
runInputScript(4, _mouseButStat, 1);
- } else if (_mouseButStat&0xC000) {
- byte code = _mouseButStat&0x8000 ? 1 : 2;
+ } else if (_mouseButStat&MBS_MOUSE_MASK) {
+ byte code = _mouseButStat&MBS_LEFT_CLICK ? 1 : 2;
if (mouse.y >= virtscr[0].topline && mouse.y < virtscr[0].topline + virtscr[0].height) {
over = checkMouseOver(mouse.x, mouse.y);
if (over != 0) {