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/stuff.cc | |
| 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/stuff.cc')
| -rw-r--r-- | crawl-ref/source/stuff.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc index 463534060f..d7dbcd38e1 100644 --- a/crawl-ref/source/stuff.cc +++ b/crawl-ref/source/stuff.cc @@ -1054,7 +1054,7 @@ bool yesno( const char *str, bool safe, int safeanswer, bool clear_after, if (!noprompt) mpr(prompt.c_str(), MSGCH_PROMPT); - int tmp = getchm(KC_CONFIRM); + int tmp = getchm(KMC_CONFIRM); if (map && map->find(tmp) != map->end()) tmp = map->find(tmp)->second; @@ -1155,7 +1155,7 @@ int yesnoquit( const char* str, bool safe, int safeanswer, bool allow_all, { mpr(prompt.c_str(), MSGCH_PROMPT); - int tmp = getchm(KC_CONFIRM); + int tmp = getchm(KMC_CONFIRM); if (tmp == CK_ESCAPE || tmp == CONTROL('G') || tmp == 'q' || tmp == 'Q') return -1; |