From 9206d5f989a000bf928bbfc8d7bf0e64e7ce6ae3 Mon Sep 17 00:00:00 2001 From: dolorous Date: Tue, 10 Mar 2009 16:11:24 +0000 Subject: Add minor cosmetic fixes. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9407 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/beam.cc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'crawl-ref/source/beam.cc') diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 9dc223b63e..fe701dc282 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -3831,17 +3831,15 @@ void bolt::affect_player() bool was_affected = false; int old_hp = you.hp; - hurted = std::max(hurted, 0); + hurted = std::max(0, hurted); // If the beam is an actual missile or of the MMISSILE type (Earth magic) // we might bleed on the floor. if (!engulfs && (flavour == BEAM_MISSILE || flavour == BEAM_MMISSILE)) { - int blood = hurted / 2; // assumes DVORP_PIERCING, factor: 0.5 - if (blood > you.hp) - blood = you.hp; - + // assumes DVORP_PIERCING, factor: 0.5 + int blood = std::min(you.hp, hurted / 2); bleed_onto_floor(you.pos(), -1, blood, true); } @@ -3865,8 +3863,8 @@ void bolt::affect_player() // handling of missiles if (item && item->base_type == OBJ_MISSILES) { - // SPMSL_POISONED handled via callback _poison_hit_victim() in - // item_use.cc + // SPMSL_POISONED is handled via callback _poison_hit_victim() + // in item_use.cc. if (item->sub_type == MI_THROWING_NET) { player_caught_in_net(); -- cgit v1.2.3-54-g00ecf