summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-11 19:51:55 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-11 19:51:55 +0000
commit807feb82ade2f6ad782bb6e81c30abfcc0741544 (patch)
treee4fdf8f197ae8ccc756b6d90a14589a52b62d192 /crawl-ref/source/fight.cc
parentdc24fce640225bfc22bfb7410a9b01c24801becc (diff)
downloadcrawl-ref-807feb82ade2f6ad782bb6e81c30abfcc0741544.tar.gz
crawl-ref-807feb82ade2f6ad782bb6e81c30abfcc0741544.zip
Fix for 1805138: wands of draining no longer leak information when the
bolt misses. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2442 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r--crawl-ref/source/fight.cc10
1 files changed, 4 insertions, 6 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 5bf1d1b43f..0972bcf624 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -3631,7 +3631,7 @@ int weapon_str_weight( object_class_type wpn_class, int wpn_type )
// - Short Blades are the best for the dexterous... although they
// are very limited in damage potential
// - Long Swords are better for the dexterous, the two-handed
- // swords are a 50/50 spit; bastard swords are in between.
+ // swords are a 50/50 split; bastard swords are in between.
// - Staves: didn't want to punish the mages who want to use
// these... made it a 50/50 split after the 2-hnd bonus
// - Polearms: Spears and tridents are the only ones that can
@@ -3739,12 +3739,10 @@ static inline int calc_stat_to_dam_base( void )
static void stab_message( struct monsters *defender, int stab_bonus )
{
- int r = random2(6); // for randomness
-
switch(stab_bonus)
{
case 3: // big melee, monster surrounded/not paying attention
- if (r<3)
+ if (coinflip())
{
mprf( "You strike %s from a blind spot!",
defender->name(DESC_NOCAP_THE).c_str() );
@@ -3756,7 +3754,7 @@ static void stab_message( struct monsters *defender, int stab_bonus )
}
break;
case 2: // confused/fleeing
- if (r<4)
+ if ( !one_chance_in(3) )
{
mprf( "You catch %s completely off-guard!",
defender->name(DESC_NOCAP_THE).c_str() );
@@ -3772,5 +3770,5 @@ static void stab_message( struct monsters *defender, int stab_bonus )
defender->name(DESC_CAP_THE).c_str(),
defender->pronoun(PRONOUN_REFLEXIVE).c_str() );
break;
- } // end switch
+ }
}