diff options
| author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-27 14:14:43 +0000 |
|---|---|---|
| committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-27 14:14:43 +0000 |
| commit | 09f449f50d9f136fb7dd0dfb848ee953b2851aaf (patch) | |
| tree | 3c0b106fb9ab95e5f7af9665beb981dd809a95d1 | |
| parent | bfb33c9da32cd4f9c19ac1ff98c9a1e252a8f92e (diff) | |
| download | crawl-ref-09f449f50d9f136fb7dd0dfb848ee953b2851aaf.tar.gz crawl-ref-09f449f50d9f136fb7dd0dfb848ee953b2851aaf.zip | |
Fixing macro crashes for Tiles in 0.4 branch.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6695 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/cmd-keys.h | 7 | ||||
| -rw-r--r-- | crawl-ref/source/enum.h | 9 |
2 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/cmd-keys.h b/crawl-ref/source/cmd-keys.h index dee35bff54..34ef74e4ee 100644 --- a/crawl-ref/source/cmd-keys.h +++ b/crawl-ref/source/cmd-keys.h @@ -158,13 +158,10 @@ {'N', CMD_TARGET_DIR_DOWN_RIGHT}, {'U', CMD_TARGET_DIR_UP_RIGHT}, {'Y', CMD_TARGET_DIR_UP_LEFT}, +{CK_MOUSE_MOVE, CMD_TARGET_MOUSE_MOVE}, +{CK_MOUSE_CLICK, CMD_TARGET_MOUSE_SELECT}, {CK_MOUSE_MOVE, CMD_MOUSE_MOVE}, {CK_MOUSE_CLICK, CMD_MOUSE_CLICK}, -#ifdef USE_TILE -{CK_MOUSE_MOVE, CMD_TARGET_MOUSE_MOVE}, -{CK_MOUSE_CLICK, CMD_TARGET_MOUSE_SELECT}, -#endif - {'\0', CMD_NO_CMD} diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index b78ef3325c..0807151aee 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -620,16 +620,17 @@ enum command_type CMD_TARGET_WIZARD_GIVE_ITEM, CMD_TARGET_WIZARD_MOVE, CMD_TARGET_WIZARD_PATHFIND, + CMD_TARGET_MOUSE_MOVE, + CMD_TARGET_MOUSE_SELECT, CMD_TARGET_HELP, CMD_MAX_TARGET = CMD_TARGET_HELP, #ifdef USE_TILE - CMD_TARGET_MOUSE_MOVE, - CMD_MIN_TILE = CMD_TARGET_MOUSE_MOVE, - CMD_TARGET_MOUSE_SELECT, CMD_EDIT_PREFS, + CMD_MIN_TILE = CMD_EDIT_PREFS, CMD_EDIT_PLAYER_TILE, CMD_USE_ITEM, + CMD_NEXT_CMD, CMD_VIEW_ITEM, CMD_MAX_TILE = CMD_VIEW_ITEM, #endif @@ -639,8 +640,10 @@ enum command_type CMD_MIN_SYNTHETIC = CMD_DISABLE_MORE, CMD_ENABLE_MORE, +#ifndef USE_TILE // [ds] Silently ignored, requests another round of input. CMD_NEXT_CMD, +#endif // Stick the keyspresses of the command to be repeated into the // input buffer. |