Add minor cosmetic fixes, mostly involving whitespace and comments.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3001 c06c8d41-db1a-0410-9941-cceddc491573

5 files changed, 14 insertions, 14 deletions

diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index faebaa28fa..9129c9159c 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -196,7 +196,7 @@ static void ench_animation( int flavour, const monsters *mon, bool force )
                      (flavour == BEAM_POLYMORPH)     ? EC_MUTAGENIC :
                      (flavour == BEAM_TELEPORT
                           || flavour == BEAM_BANISH
-                          || flavour == BEAM_BLINK)  ? EC_WARP 
+                          || flavour == BEAM_BLINK)  ? EC_WARP
                                                      : EC_ENCHANT;
     zap_animation( element_colour( elem ), mon, force );
 }
@@ -1519,7 +1519,7 @@ void fire_beam( bolt &pbolt, item_def *item )
         beam_drop_object( pbolt, item, tx, ty );
 
     // check for explosion.  NOTE that for tracers, we have to make a copy
-    // of target co'ords and then reset after calling this -- tracers should
+    // of target co-ords and then reset after calling this -- tracers should
     // never change any non-tracers fields in the beam structure. -- GDL
     int ox = pbolt.target_x;
     int oy = pbolt.target_y;
@@ -2557,7 +2557,7 @@ int affect(bolt &beam, int x, int y)
     {
         // Done this way so that poison blasts affect the target once (via
         // place_cloud) and explosion spells only affect the target once
-        // (during the explosion phase, not an initial hit during the 
+        // (during the explosion phase, not an initial hit during the
         // beam phase).
         if (!beam.is_big_cloud
             && (!beam.is_explosion || beam.in_explosion_phase))
@@ -3231,7 +3231,7 @@ static int affect_player( bolt &beam )
         }
 
         ench_animation( beam.flavour );
-        
+
         // these colors are misapplied - see mons_ench_f2() {dlb}
         switch (beam.flavour)
         {
@@ -4850,7 +4850,7 @@ bool nasty_beam(monsters *mon, bolt &beam)
     return (true);
 }
 
-bool nice_beam( struct monsters *mon, struct bolt &beam )
+bool nice_beam( monsters *mon, bolt &beam )
 {
     // haste
     if (beam.flavour == BEAM_HASTE || beam.flavour == BEAM_HEALING
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 98f9377224..61c6198176 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -2346,8 +2346,7 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus,
     }
     else
     {
-        // Dropping item copy, since the launched item might be different
-        // (e.g. venom blowgun)
+        // Dropping item copy, since the launched item might be different.
         fire_beam(pbolt, returning ? NULL : &item);
     }
 
diff --git a/crawl-ref/source/itemprop.h b/crawl-ref/source/itemprop.h
index 39292bcbd5..24231fa2f2 100644
--- a/crawl-ref/source/itemprop.h
+++ b/crawl-ref/source/itemprop.h
@@ -352,7 +352,7 @@ enum special_missile_type // to separate from weapons in general {dlb}
     SPMSL_CURARE                       //    5
 };
 
-enum special_ring_type // jewellery mitm[].special values 
+enum special_ring_type // jewellery mitm[].special values
 {
     SPRING_RANDART = 200,
     SPRING_UNRANDART = 201
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 7df3bd4615..7c1837cc9e 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -1679,12 +1679,12 @@ static special_missile_type determine_missile_brand(const item_def& item,
     // All needles are either poison or curare.
     if (item.sub_type == MI_NEEDLE)
         rc = got_curare_roll(item_level) ? SPMSL_CURARE : SPMSL_POISONED;
-    else        
+    else
     {
         const int temp_rand =
             (force_good ? random2(150) : random2(2000 - 55 * item_level));
 
-        if ( temp_rand < 60 )
+        if (temp_rand < 60)
             rc = SPMSL_FLAME;
         else if (temp_rand < 120)
             rc = SPMSL_ICE;
@@ -1701,13 +1701,14 @@ static special_missile_type determine_missile_brand(const item_def& item,
 
     // Un-poison sling bullets; unbrand javelins and throwing nets.
     if ((item.sub_type == MI_SLING_BULLET && rc == SPMSL_POISONED)
-        || item.sub_type == MI_JAVELIN || item.sub_type == MI_THROWING_NET)
+         || item.sub_type == MI_JAVELIN || item.sub_type == MI_THROWING_NET)
     {
         rc = SPMSL_NORMAL;
     }
+
     return rc;
 }
-                          
+
 static void generate_missile_item(item_def& item, int force_type,
                                   int item_level, int item_race)
 {
diff --git a/crawl-ref/source/randart.cc b/crawl-ref/source/randart.cc
index 933495d422..432fa4801e 100644
--- a/crawl-ref/source/randart.cc
+++ b/crawl-ref/source/randart.cc
@@ -897,7 +897,7 @@ void randart_desc_properties( const item_def &item,
     randart_prop_type fake_rap  = RAP_NUM_PROPERTIES;
     int               fake_plus = 1;
 
-    // The base jewelery type is one whose property is revealed by
+    // The base jewellery type is one whose property is revealed by
     // wearing it, but whose property isn't revealed by having
     // ISFLAG_KNOW_PLUSES set.  For a randart with a base type of, for
     // example, a ring of strength, wearing it sets
@@ -924,7 +924,7 @@ void randart_desc_properties( const item_def &item,
     case AMU_RAGE:
         fake_rap = RAP_BERSERK;
         break;
-    }    
+    }
 
     if (fake_rap != RAP_NUM_PROPERTIES)
     {