Minor typesafety fix.

Added description for '!' and '@' to targeting help.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7137 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 2 insertions, 16 deletions

diff --git a/crawl-ref/source/macro.h b/crawl-ref/source/macro.h
index be3a51d974..2765136fac 100644
--- a/crawl-ref/source/macro.h
+++ b/crawl-ref/source/macro.h
@@ -11,6 +11,8 @@
 
 #include <deque>
 
+#include "enum.h"
+
 #ifndef MACRO_CC
 
 #undef getch
@@ -18,22 +20,6 @@
 
 #endif
 
-enum KeymapContext {
-    KC_DEFAULT,         // For no-arg getchm(), must be zero.
-    KC_LEVELMAP,        // When in the 'X' level map
-    KC_TARGETING,       // Only during 'x' and other targeting modes
-    KC_CONFIRM,         // When being asked y/n/q questions
-    KC_MENU,            // For menus
-
-#ifdef USE_TILE
-    KC_TILE,            // For context_for_command()
-#endif
-
-    KC_CONTEXT_COUNT,   // Must always be the last real context
-
-    KC_NONE
-};
-
 class key_recorder;
 typedef bool (*key_recorder_callback)(key_recorder *recorder,
                                       int &ch, bool reverse);