summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/beam.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2007-12-05 07:16:33 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2007-12-05 07:16:33 +0000
commit503d86058c66fc541df68dd356390f0d2fe36c16 (patch)
tree9ab575ce868f77b18e7a8b5d1ded19603f8c7252 /crawl-ref/source/beam.cc
parent28b3dd9db78b3d98762e5be3ff80256aea60759a (diff)
downloadcrawl-ref-503d86058c66fc541df68dd356390f0d2fe36c16.tar.gz
crawl-ref-503d86058c66fc541df68dd356390f0d2fe36c16.zip
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
Diffstat (limited to 'crawl-ref/source/beam.cc')
-rw-r--r--crawl-ref/source/beam.cc10
1 files changed, 5 insertions, 5 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