From 24998da9e6f7deb80fd5644cc2f1723434386c93 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Fri, 6 Nov 2009 18:39:12 -0600 Subject: Remove trailing whitespace. --- crawl-ref/source/actor.cc | 2 +- crawl-ref/source/dungeon.cc | 2 +- crawl-ref/source/l_dgngrd.cc | 4 ++-- crawl-ref/source/makeitem.cc | 2 +- crawl-ref/source/mon-cast.cc | 4 ++-- crawl-ref/source/mon-spll.h | 2 +- crawl-ref/source/mon-util.cc | 2 +- crawl-ref/source/monplace.cc | 2 +- crawl-ref/source/monplace.h | 2 +- crawl-ref/source/showsymb.h | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/crawl-ref/source/actor.cc b/crawl-ref/source/actor.cc index b00125f5b7..efc56962ef 100644 --- a/crawl-ref/source/actor.cc +++ b/crawl-ref/source/actor.cc @@ -21,7 +21,7 @@ bool actor::can_see(const actor *target) const { return (target->visible_to(this) && see_cell(target->pos())); } - + bool actor::has_equipped(equipment_type eq, int sub_type) const { const item_def *item = slot_item(eq); diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index c9e3642688..eb8f637598 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -3375,7 +3375,7 @@ static monster_type _choose_unique_by_depth(int step) default: ret = random_choose(MONS_FRANCIS, MONS_FRANCES, MONS_WAYNE, MONS_DUANE, MONS_XTAHUA, MONS_NORRIS, MONS_FREDERICK, MONS_NIKOLA, - MONS_MARGERY, MONS_BORIS, MONS_SAINT_ROKA, MONS_AIZUL, + MONS_MARGERY, MONS_BORIS, MONS_SAINT_ROKA, MONS_AIZUL, -1); } diff --git a/crawl-ref/source/l_dgngrd.cc b/crawl-ref/source/l_dgngrd.cc index ed8e1aed9b..022c1882ec 100644 --- a/crawl-ref/source/l_dgngrd.cc +++ b/crawl-ref/source/l_dgngrd.cc @@ -220,9 +220,9 @@ static int dgn_in_bounds(lua_State *ls) int y = luaL_checkint(ls, 2); lua_pushboolean(ls, in_bounds(x, y)); - return 1; + return (1); } - + static int dgn_grid(lua_State *ls) { GETCOORD(c, 1, 2, map_bounds); diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index 48b12b2c3f..3fabf1e128 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -3502,7 +3502,7 @@ static item_make_species_type _give_weapon(monsters *mon, int level, do_curse_item(item); break; - case MONS_AIZUL: + case MONS_AIZUL: if (one_chance_in(3)) level = MAKE_GOOD_ITEM; diff --git a/crawl-ref/source/mon-cast.cc b/crawl-ref/source/mon-cast.cc index 1878967d44..0532925ca3 100644 --- a/crawl-ref/source/mon-cast.cc +++ b/crawl-ref/source/mon-cast.cc @@ -1563,7 +1563,7 @@ void mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast, god_type god = (priest || !(priest || wizard)) ? monster->god : GOD_NO_GOD; // Used for summon X elemental, and nothing else. {bookofjude} - monster_type el_summon_type = MONS_NO_MONSTER; + monster_type el_summon_type = MONS_NO_MONSTER; switch (spell_cast) { @@ -2071,7 +2071,7 @@ void mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast, 20, MONS_GREAT_ORB_OF_EYES, 10, MONS_EYE_OF_DEVASTATION, 0)); - + create_monster( mgen_data(mon, SAME_ATTITUDE(monster), duration, spell_cast, monster->pos(), monster->foe, 0, god)); diff --git a/crawl-ref/source/mon-spll.h b/crawl-ref/source/mon-spll.h index 7971b99276..a59e245575 100644 --- a/crawl-ref/source/mon-spll.h +++ b/crawl-ref/source/mon-spll.h @@ -1274,7 +1274,7 @@ SPELL_MINOR_HEALING } }, - + { MST_TEST_SPAWNER, { SPELL_SHADOW_CREATURES, diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index ba3ef8fe00..6383fef27c 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -2624,7 +2624,7 @@ bool mons_has_los_ability(int mclass) return (true); // These eyes only need LOS, as well. (The other eyes use spells.) - if (mclass == MONS_GIANT_EYEBALL || mclass == MONS_EYE_OF_DRAINING + if (mclass == MONS_GIANT_EYEBALL || mclass == MONS_EYE_OF_DRAINING || mclass == MONS_GOLDEN_EYE) return (true); diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc index 14451f56c1..c2c9d714cd 100644 --- a/crawl-ref/source/monplace.cc +++ b/crawl-ref/source/monplace.cc @@ -1944,7 +1944,7 @@ static band_type _choose_band(int mon_type, int power, int &band_size) case MONS_GOLDEN_EYE: band = BAND_GOLDEN_EYE; band_size = 1 + random2(5); - break; + break; } // end switch if (band != BAND_NO_BAND && band_size == 0) diff --git a/crawl-ref/source/monplace.h b/crawl-ref/source/monplace.h index de0a2a175f..148f0e82f6 100644 --- a/crawl-ref/source/monplace.h +++ b/crawl-ref/source/monplace.h @@ -67,7 +67,7 @@ enum band_type BAND_AZRAEL, BAND_DUVESSA, // 50 BAND_KHUFU, - BAND_GOLDEN_EYE, + BAND_GOLDEN_EYE, NUM_BANDS // always last }; diff --git a/crawl-ref/source/showsymb.h b/crawl-ref/source/showsymb.h index 2976ceccfe..d74016bcd3 100644 --- a/crawl-ref/source/showsymb.h +++ b/crawl-ref/source/showsymb.h @@ -16,7 +16,7 @@ unsigned grid_character_at(const coord_def &c); unsigned get_symbol(show_type object, unsigned short *colour = NULL, bool magic_mapped = false); void get_symbol(const coord_def& where, - show_type object, unsigned *ch, + show_type object, unsigned *ch, unsigned short *colour, bool magic_mapped = false); void get_show_symbol(show_type object, unsigned *ch, unsigned short *colour); -- cgit v1.2.3-54-g00ecf