diff options
author | Johanna Ploog <j-p-e-g@users.sourceforge.net> | 2011-03-15 21:36:06 +0100 |
---|---|---|
committer | Johanna Ploog <j-p-e-g@users.sourceforge.net> | 2011-03-15 21:37:32 +0100 |
commit | e1f25efed66fbca5b4b99c50e0f3955f8dcd799e (patch) | |
tree | 6c752602679a14e1eda278009458696034cdd09d /crawl-ref/source/tilereg-dgn.cc | |
parent | c86ecd53f5117eb1725cd6322e4d0f2b5495f022 (diff) | |
download | crawl-ref-e1f25efed66fbca5b4b99c50e0f3955f8dcd799e.tar.gz crawl-ref-e1f25efed66fbca5b4b99c50e0f3955f8dcd799e.zip |
Fix #3596: "Unknown command" when mouseclick-travelling.
Diffstat (limited to 'crawl-ref/source/tilereg-dgn.cc')
-rw-r--r-- | crawl-ref/source/tilereg-dgn.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/crawl-ref/source/tilereg-dgn.cc b/crawl-ref/source/tilereg-dgn.cc index 15f7b722cd..1fe07acc49 100644 --- a/crawl-ref/source/tilereg-dgn.cc +++ b/crawl-ref/source/tilereg-dgn.cc @@ -892,7 +892,10 @@ int tile_click_cell(const coord_def &gc, unsigned char mod) if ((mod & MOD_CTRL) && adjacent(you.pos(), gc)) { - process_command((command_type) click_travel(gc, mod & MOD_CTRL)); + const int cmd = click_travel(gc, mod & MOD_CTRL); + if (cmd != CK_MOUSE_CMD) + process_command((command_type) cmd); + return (CK_MOUSE_CMD); } @@ -901,7 +904,10 @@ int tile_click_cell(const coord_def &gc, unsigned char mod) if (mod & (MOD_SHIFT | MOD_CTRL | MOD_ALT)) return (CK_MOUSE_CMD); - process_command((command_type) click_travel(gc, mod & MOD_CTRL)); + const int cmd = click_travel(gc, mod & MOD_CTRL); + if (cmd != CK_MOUSE_CMD) + process_command((command_type) cmd); + return (CK_MOUSE_CMD); } |