diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-26 15:08:48 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-26 15:08:48 +0000 |
| commit | a291e99809652bb3308f08d777bafb134328d835 (patch) | |
| tree | e6fa16ffe6ec572ac2f8ba44a62575d70a2e6bfe /crawl-ref/source/ouch.cc | |
| parent | 7dd20bb5af17f48ca9a2ff5e4d63cd494e0498de (diff) | |
| download | crawl-ref-a291e99809652bb3308f08d777bafb134328d835.tar.gz crawl-ref-a291e99809652bb3308f08d777bafb134328d835.zip | |
Disallow quivering equipped items. (You can still (fi)re your wielded
weapon if you insist, you just can't quiver it.)
And another general clean-up.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6149 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/ouch.cc')
| -rw-r--r-- | crawl-ref/source/ouch.cc | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc index 588c4bdd8e..ca34b768e0 100644 --- a/crawl-ref/source/ouch.cc +++ b/crawl-ref/source/ouch.cc @@ -101,7 +101,7 @@ int check_your_resists(int hurted, beam_type flavour) { mpr( "Your icy shield dissipates!", MSGCH_DURATION ); you.duration[DUR_CONDENSATION_SHIELD] = 0; - you.redraw_armour_class = 1; + you.redraw_armour_class = true; } } @@ -426,7 +426,7 @@ void item_corrode( int itco ) else item.plus = how_rusty; - you.redraw_armour_class = 1; // for armour, rings, etc. {dlb} + you.redraw_armour_class = true; // for armour, rings, etc. {dlb} if (you.equip[EQ_WEAPON] == itco) you.wield_change = true; @@ -665,9 +665,9 @@ void lose_level() you.hp, you.hp_max, you.magic_points, you.max_magic_points); take_note(Note(NOTE_XP_LEVEL_CHANGE, you.experience_level, 0, buf)); - you.redraw_experience = 1; + you.redraw_experience = true; xom_is_stimulated(255); -} // end lose_level() +} void drain_exp(bool announce_full) { @@ -733,19 +733,16 @@ void drain_exp(bool announce_full) mprf(MSGCH_DIAGNOSTICS, "You lose %ld experience points.",exp_drained); #endif - you.redraw_experience = 1; + you.redraw_experience = true; if (you.experience < exp_needed(you.experience_level + 1)) lose_level(); } -} // end drain_exp() +} static void xom_checks_damage(kill_method_type death_type, int dam, int death_source) { - //if (you.hp <= dam) - // xom_is_stimulated(32); - if (death_type == KILLED_BY_TARGETTING) { // Xom thinks the player hurting him/herself is funny. @@ -813,7 +810,7 @@ static void xom_checks_damage(kill_method_type death_type, xom_is_stimulated(amusementvalue); } -// death_source should be set to zero for non-monsters {dlb} +// death_source should be set to zero for non-monsters. {dlb} void ouch( int dam, int death_source, kill_method_type death_type, const char *aux, bool see_source ) { |