diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-26 16:32:37 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-26 16:32:37 +0000 |
| commit | 8392b67ef4de1321bc73b224647d400de1cb1ff4 (patch) | |
| tree | da79ebfc48b7a719697046fcbfd6ca58fa770937 /crawl-ref | |
| parent | cedbcef437a9834f6ccae42848f118351fd8a086 (diff) | |
| download | crawl-ref-8392b67ef4de1321bc73b224647d400de1cb1ff4.tar.gz crawl-ref-8392b67ef4de1321bc73b224647d400de1cb1ff4.zip | |
Added cset_unicode to options texts (V-Napkin), fixed staff of energy not working for transformations (syllogism).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2601 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/docs/crawl_options.txt | 4 | ||||
| -rw-r--r-- | crawl-ref/init.txt | 3 | ||||
| -rw-r--r-- | crawl-ref/source/spl-cast.cc | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/crawl-ref/docs/crawl_options.txt b/crawl-ref/docs/crawl_options.txt index 81b2635e11..d35c4461f4 100644 --- a/crawl-ref/docs/crawl_options.txt +++ b/crawl-ref/docs/crawl_options.txt @@ -83,8 +83,8 @@ The contents of this text are: 6- Miscellaneous. 6-a All OS. macro_meta_entry, mouse_input, wiz_mode, colours, - char_set, cset_ascii, cset_ibm, cset_dec, feature, - mon_glyph, classic_item_colours + char_set, cset_ascii, cset_ibm, cset_dec, cset_unicode, + feature, mon_glyph, classic_item_colours 6-b DOS and Windows. dos_use_background_intensity 6-c Unix diff --git a/crawl-ref/init.txt b/crawl-ref/init.txt index 6458cde000..bd8546ce9a 100644 --- a/crawl-ref/init.txt +++ b/crawl-ref/init.txt @@ -272,7 +272,8 @@ message_colour = lightcyan:LOW MAGIC WARNING # classic_item_colours = true # # See crawl_options.txt for the options -# char_set, cset_ascii, cset_ibm, cset_dec, cset_any, feature, mon_glyph +# char_set, cset_ascii, cset_ibm, cset_dec, cset_unicode, +# cset_any, feature, mon_glyph ##### 6-b DOS and Windows ####################### diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index 335aa9003e..58004d3087 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -671,6 +671,7 @@ bool cast_a_spell() return (false); } + const bool staff_energy = player_energy(); if (you.duration[DUR_CONF]) random_uselessness( 2 + random2(7), 0 ); else @@ -688,7 +689,7 @@ bool cast_a_spell() dec_mp( spell_mana(spell) ); - if (!player_energy() && you.is_undead != US_UNDEAD) + if (!staff_energy && you.is_undead != US_UNDEAD) { const int spellh = spell_hunger( spell ); if (spellh > 0) |