diff options
| author | Kamil Zbróg | 2014-01-12 18:44:51 +0000 |
|---|---|---|
| committer | Kamil Zbróg | 2014-01-12 18:44:51 +0000 |
| commit | 444934a0accec982f55db92c17ef65270fe18e66 (patch) | |
| tree | f62210b1ff15696accd87d97b68b03688a153156 /backends/platform/dc/input.cpp | |
| parent | e94fabc37407a7d300af04493b0f5cbced42a092 (diff) | |
| parent | 1a4f951f8bff52f6185304722f2ab9cf9bcd58f4 (diff) | |
| download | scummvm-rg350-444934a0accec982f55db92c17ef65270fe18e66.tar.gz scummvm-rg350-444934a0accec982f55db92c17ef65270fe18e66.tar.bz2 scummvm-rg350-444934a0accec982f55db92c17ef65270fe18e66.zip | |
Merge remote-tracking branch 'sync/master' into prince-malik
Diffstat (limited to 'backends/platform/dc/input.cpp')
| -rw-r--r-- | backends/platform/dc/input.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/backends/platform/dc/input.cpp b/backends/platform/dc/input.cpp index 7b21c76efa..5c6adf6c7c 100644 --- a/backends/platform/dc/input.cpp +++ b/backends/platform/dc/input.cpp @@ -50,10 +50,10 @@ int handleInput(struct mapledev *pad, int &mouse_x, int &mouse_y, else if (!(buttons & 512)) newkey = ' '; else if (!(buttons & 1024)) newkey = numpadmap[(buttons>>4)&15]; - if (!(buttons & 128)) if (inter) newkey = 1001; else mouse_x++; - if (!(buttons & 64)) if (inter) newkey = 1002; else mouse_x--; - if (!(buttons & 32)) if (inter) newkey = 1003; else mouse_y++; - if (!(buttons & 16)) if (inter) newkey = 1004; else mouse_y--; + if (!(buttons & 128)) { if (inter) newkey = 1001; else mouse_x++; } + if (!(buttons & 64)) { if (inter) newkey = 1002; else mouse_x--; } + if (!(buttons & 32)) { if (inter) newkey = 1003; else mouse_y++; } + if (!(buttons & 16)) { if (inter) newkey = 1004; else mouse_y--; } mouse_x += ((int)pad->cond.controller.joyx-128)>>4; mouse_y += ((int)pad->cond.controller.joyy-128)>>4; @@ -157,7 +157,7 @@ int handleInput(struct mapledev *pad, int &mouse_x, int &mouse_y, return -Common::EVENT_RBUTTONUP; } - if (mouse_wheel != lastwheel) + if (mouse_wheel != lastwheel) { if (((int8)(mouse_wheel - lastwheel)) > 0) { lastwheel++; return -Common::EVENT_WHEELDOWN; @@ -165,6 +165,7 @@ int handleInput(struct mapledev *pad, int &mouse_x, int &mouse_y, --lastwheel; return -Common::EVENT_WHEELUP; } + } if (newkey && inter && newkey != lastkey) { int transkey = inter->key(newkey, shiftFlags); |