diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-18 21:03:49 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-18 21:03:49 +0000 |
| commit | d120c8b8553ad8e36a20a63cfe597b2f1eafceef (patch) | |
| tree | c170fbfc0014f991bbf539c65384a6bf9709fbcc /crawl-ref/source/macro.cc | |
| parent | 92f29fb38841f8645a3e3ca9d2ad0f3fa32267db (diff) | |
| download | crawl-ref-d120c8b8553ad8e36a20a63cfe597b2f1eafceef.tar.gz crawl-ref-d120c8b8553ad8e36a20a63cfe597b2f1eafceef.zip | |
Another step on the way to player doll customization. Including some
predefined doll settings in dolls.txt, so players can actually use this.
TODO: Save choice back into file.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9999 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/macro.cc')
| -rw-r--r-- | crawl-ref/source/macro.cc | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/crawl-ref/source/macro.cc b/crawl-ref/source/macro.cc index b53d210f9a..61070cf855 100644 --- a/crawl-ref/source/macro.cc +++ b/crawl-ref/source/macro.cc @@ -63,10 +63,6 @@ static macromap *all_maps[] = &Keymaps[KMC_TARGETING], &Keymaps[KMC_CONFIRM], -#ifdef USE_TILE - &Keymaps[KMC_TILE], -#endif - &Macros, }; @@ -1106,17 +1102,6 @@ command_type key_to_command(int key, KeymapContext context) key_to_cmd_map &key_map = _keys_to_cmds[context]; key_to_cmd_map::iterator it = key_map.find(key); -#if 0 -#ifdef USE_TILE - if (context != KMC_TILE && it == key_map.end()) - { - context = KMC_TILE; - key_map = _keys_to_cmds[KMC_TILE]; - it = key_map.find(key); - } -#endif -#endif - if (it == key_map.end()) return CMD_NO_CMD; @@ -1145,12 +1130,6 @@ int command_to_key(command_type cmd) KeymapContext context_for_command(command_type cmd) { -#if 0 -#ifdef USE_TILE - if (cmd >= CMD_MIN_TILE && cmd <= CMD_MAX_TILE) - return KMC_TILE; -#endif -#endif if (cmd > CMD_NO_CMD && cmd <= CMD_MAX_NORMAL) return KMC_DEFAULT; |