diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-22 20:12:04 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-22 20:12:04 +0000 |
commit | 99be0be3c7f5bd4fa41cde1bf7f4f8b4c9569efc (patch) | |
tree | df9ae0845d78719ec8c1fd2033ae1224a80ed3f3 /crawl-ref/source | |
parent | d6cdd1b6e2bd4bcd51221ef3113a10bde13867ba (diff) | |
download | crawl-ref-99be0be3c7f5bd4fa41cde1bf7f4f8b4c9569efc.tar.gz crawl-ref-99be0be3c7f5bd4fa41cde1bf7f4f8b4c9569efc.zip |
Fix ?immolation not being autoID'd upon reading.
Fix ?uselessness not using the misc. descriptions.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6051 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
-rw-r--r-- | crawl-ref/source/database.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/effects.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/item_use.cc | 5 | ||||
-rw-r--r-- | crawl-ref/source/ouch.h | 8 | ||||
-rw-r--r-- | crawl-ref/source/spells4.cc | 5 | ||||
-rw-r--r-- | crawl-ref/source/xom.cc | 26 |
6 files changed, 23 insertions, 29 deletions
diff --git a/crawl-ref/source/database.cc b/crawl-ref/source/database.cc index 50c3ca4c7a..254b800b57 100644 --- a/crawl-ref/source/database.cc +++ b/crawl-ref/source/database.cc @@ -103,8 +103,8 @@ static TextDB& DescriptionDB = AllDBs[0]; static TextDB& RandartDB = AllDBs[1]; static TextDB& SpeakDB = AllDBs[2]; static TextDB& ShoutDB = AllDBs[3]; -static TextDB& HelpDB = AllDBs[4]; -static TextDB& MiscDB = AllDBs[5]; +static TextDB& MiscDB = AllDBs[4]; +static TextDB& HelpDB = AllDBs[5]; // ---------------------------------------------------------------------- // TextDB diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index 2d177bcdf4..254f3fc7f0 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -2107,14 +2107,14 @@ bool forget_inventory(bool quiet) return (items_forgotten > 0); } -// returns true if there was a visible change +// Returns true if there was a visible change. bool vitrify_area(int radius) { if (radius < 2) return (false); const int radius2 = radius * radius; - // this hinges on clear wall types having the same order as non-clear ones + // This hinges on clear wall types having the same order as non-clear ones! const int clear_plus = DNGN_CLEAR_ROCK_WALL - DNGN_ROCK_WALL; bool something_happened = false; for ( int x = X_BOUND_1; x <= X_BOUND_2; ++x ) diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index cf405cae35..e462ffb936 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -4343,6 +4343,7 @@ void read_scroll( int slot ) case SCR_IMMOLATION: mpr("The scroll explodes in your hands!"); // We do this here to prevent it from blowing itself up. + set_ident_type( scroll, ID_KNOWN_TYPE ); dec_inv_item_quantity( item_slot, 1 ); // unsure about this // BEAM_EXPLOSION instead? {dlb} @@ -4534,8 +4535,8 @@ void read_scroll( int slot ) set_ident_type( scroll, (id_the_scroll) ? ID_KNOWN_TYPE : ID_TRIED_TYPE ); - // finally, destroy and identify the scroll - // scrolls of immolation were already destroyed earlier + // Finally, destroy and identify the scroll. + // Scrolls of immolation were already destroyed earlier. if (which_scroll != SCR_PAPER && which_scroll != SCR_IMMOLATION) { if (id_the_scroll) diff --git a/crawl-ref/source/ouch.h b/crawl-ref/source/ouch.h index d51786072c..7f66535d75 100644 --- a/crawl-ref/source/ouch.h +++ b/crawl-ref/source/ouch.h @@ -87,14 +87,6 @@ void weapon_acid(char acid_strength); // last updated 12may2000 {dlb} /* *********************************************************************** - * called from: acr - bang - beam - effects - fight - misc - spells - - * spells2 - * *********************************************************************** */ -void scrolls_burn(char burn_strength, char target_class); - - -// last updated 12may2000 {dlb} -/* *********************************************************************** * called from: acr - bang - beam - command - effects - fight - misc - * ouch - output - religion - spells - spells2 - spells4 * *********************************************************************** */ diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index a8b525b6a4..d232ed51b9 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -2065,11 +2065,12 @@ void cast_fragmentation(int pow) // jmf: ripped idea from airstrike // Permarock and floor are unaffected -- bwr // case DNGN_PERMAROCK_WALL: + case DNGN_CLEAR_PERMAROCK_WALL: case DNGN_FLOOR: explode = false; mprf("%s seems to be unnaturally hard.", - (grid == DNGN_PERMAROCK_WALL) ? "That wall" - : "The dungeon floor"); + (grid == DNGN_FLOOR) ? "The dungeon floor" + : "That wall"); break; default: diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index a3abecb91e..c7db8d8c7b 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -383,7 +383,7 @@ bool xom_gives_item(int power) static bool choose_mutatable_monster(const monsters* mon) { return (mon->alive() && mon->can_safely_mutate() - && !mons_is_submerged(mon)); + && !mons_is_submerged(mon)); } static monster_type xom_random_demon(int sever, bool use_greater_demons = true) @@ -699,18 +699,18 @@ static bool xom_is_good(int sever) mpr("The area is suffused with divine lightning!"); bolt beam; - beam.beam_source = NON_MONSTER; - beam.type = dchar_glyph(DCHAR_FIRED_BURST); - beam.damage = dice_def( 3, 30 ); - beam.flavour = BEAM_ELECTRICITY; - beam.target_x = you.x_pos; - beam.target_y = you.y_pos; - beam.name = "blast of lightning"; - beam.colour = LIGHTCYAN; - beam.thrower = KILL_MISC; - beam.aux_source = "Xom's lightning strike"; - beam.ex_size = 2; - beam.is_tracer = false; + beam.beam_source = NON_MONSTER; + beam.type = dchar_glyph(DCHAR_FIRED_BURST); + beam.damage = dice_def( 3, 30 ); + beam.flavour = BEAM_ELECTRICITY; + beam.target_x = you.x_pos; + beam.target_y = you.y_pos; + beam.name = "blast of lightning"; + beam.colour = LIGHTCYAN; + beam.thrower = KILL_MISC; + beam.aux_source = "Xom's lightning strike"; + beam.ex_size = 2; + beam.is_tracer = false; beam.is_explosion = true; explosion(beam); |