diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-11 20:03:20 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-11 20:03:20 +0000 |
| commit | e80122a2ce9321aaa14f1c80321525fb580182dd (patch) | |
| tree | b6e9fc250f364719ad25bdbedbff70a3443b64a7 /crawl-ref/source/enum.h | |
| parent | 294794073634d4aa598858ba8f577b95f606356d (diff) | |
| download | crawl-ref-e80122a2ce9321aaa14f1c80321525fb580182dd.tar.gz crawl-ref-e80122a2ce9321aaa14f1c80321525fb580182dd.zip | |
* Fix 2744875 (mutation screen assert).
* Rename KeymapContext KC_* -> KMC_* to avoid overlap with
kill_category KC_*.
* Increase odds for chaos brands mimicking brands that hurt the defender.
* Tweak chaos_affects_attacker().
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9595 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/enum.h')
| -rw-r--r-- | crawl-ref/source/enum.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 8420349fb3..757f20aa82 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -1449,20 +1449,21 @@ enum job_type JOB_UNKNOWN = 100 }; -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 +enum KeymapContext +{ + KMC_DEFAULT, // For no-arg getchm(), must be zero. + KMC_LEVELMAP, // When in the 'X' level map + KMC_TARGETING, // Only during 'x' and other targeting modes + KMC_CONFIRM, // When being asked y/n/q questions + KMC_MENU, // For menus #ifdef USE_TILE - KC_TILE, // For context_for_command() + KMC_TILE, // For context_for_command() #endif - KC_CONTEXT_COUNT, // Must always be the last real context + KMC_CONTEXT_COUNT, // Must always be the last real context - KC_NONE + KMC_NONE }; // This order is *critical*. Don't mess with it (see mon_enchant) |