[2032987] Fixing lack of mouse actions in tiles version. Removing unused KC_TILE macro context and moving tiles commands to KC_DEFAULT.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6738 c06c8d41-db1a-0410-9941-cceddc491573

3 files changed, 10 insertions, 28 deletions

diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 0807151aee..6fb5ba192e 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -514,6 +514,16 @@ enum command_type
 
     CMD_ANNOTATE_LEVEL,
 
+#ifdef USE_TILE
+    CMD_EDIT_PREFS,
+    CMD_EDIT_PLAYER_TILE,
+    CMD_USE_ITEM,
+    CMD_VIEW_ITEM,
+#endif
+
+    // [ds] Silently ignored, requests another round of input.
+    CMD_NEXT_CMD,
+
     // Repeat previous command
     CMD_PREV_CMD_AGAIN,
 
@@ -625,26 +635,11 @@ enum command_type
     CMD_TARGET_HELP,
     CMD_MAX_TARGET = CMD_TARGET_HELP,
 
-#ifdef USE_TILE
-    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
-
     // Disable/enable -more- prompts.
     CMD_DISABLE_MORE,
     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.
     CMD_REPEAT_KEYS,
diff --git a/crawl-ref/source/macro.cc b/crawl-ref/source/macro.cc
index c983f203d4..87a761418f 100644
--- a/crawl-ref/source/macro.cc
+++ b/crawl-ref/source/macro.cc
@@ -68,10 +68,6 @@ static macromap *all_maps[] =
     &Keymaps[KC_TARGETING],
     &Keymaps[KC_CONFIRM],
 
-#ifdef USE_TILE
-    &Keymaps[KC_TILE],
-#endif
-
     &Macros,
 };
 
@@ -1131,11 +1127,6 @@ int command_to_key(command_type cmd)
 
 KeymapContext context_for_command(command_type cmd)
 {
-#ifdef USE_TILE
-    if (cmd >= CMD_MIN_TILE && cmd <= CMD_MAX_TILE)
-        return KC_TILE;
-#endif
-
     if (cmd > CMD_NO_CMD && cmd <= CMD_MAX_NORMAL)
         return KC_DEFAULT;
 
diff --git a/crawl-ref/source/macro.h b/crawl-ref/source/macro.h
index 16c13f358c..621a791bf3 100644
--- a/crawl-ref/source/macro.h
+++ b/crawl-ref/source/macro.h
@@ -29,10 +29,6 @@ enum KeymapContext {
     KC_TARGETING,       // Only during 'x' and other targeting modes
     KC_CONFIRM,         // When being asked y/n/q questions
 
-#ifdef USE_TILE
-    KC_TILE,            // For context_for_command()
-#endif
-
     KC_CONTEXT_COUNT,   // Must always be the last real context
     KC_NONE             // Don't apply any keymaps (for menus)
 };