From 3e2e58c1756b2942fc7294cd1f36b7341e6555cd Mon Sep 17 00:00:00 2001 From: dolorous Date: Sat, 15 Mar 2008 15:05:32 +0000 Subject: Add minor whitespace fixes. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3649 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/Kills.cc | 3 +-- crawl-ref/source/describe.cc | 3 +-- crawl-ref/source/mapdef.cc | 4 ++-- crawl-ref/source/mon-util.cc | 7 +++---- crawl-ref/source/monstuff.cc | 2 +- 5 files changed, 8 insertions(+), 11 deletions(-) (limited to 'crawl-ref/source') diff --git a/crawl-ref/source/Kills.cc b/crawl-ref/source/Kills.cc index 380f4c33fd..3e34e92d4c 100644 --- a/crawl-ref/source/Kills.cc +++ b/crawl-ref/source/Kills.cc @@ -592,7 +592,6 @@ void kill_ghost::load(FILE *file) kill_monster_desc::kill_monster_desc(const monsters *mon) { - monnum = mon->type; modifier = M_NORMAL; switch (mon->type) @@ -613,7 +612,7 @@ kill_monster_desc::kill_monster_desc(const monsters *mon) } if (modifier != M_NORMAL) monnum = mon->number; - if (mon->has_ench(ENCH_SHAPESHIFTER) || + if (mon->has_ench(ENCH_SHAPESHIFTER) || mon->has_ench(ENCH_GLOWING_SHAPESHIFTER)) modifier = M_SHAPESHIFTER; diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 604017808d..ab711c0dae 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -2001,13 +2001,12 @@ void describe_monsters(monsters& mons) symbol_prefix += "_prefix"; description << getLongDescription(symbol_prefix); - switch (mons.type) { case MONS_ZOMBIE_SMALL: case MONS_ZOMBIE_LARGE: description << getLongDescription("zombie"); break; - + case MONS_SKELETON_SMALL: case MONS_SKELETON_LARGE: description << getLongDescription("skeleton"); break; diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc index fb4723ede2..5f60c44453 100644 --- a/crawl-ref/source/mapdef.cc +++ b/crawl-ref/source/mapdef.cc @@ -2048,7 +2048,7 @@ void mons_list::get_zombie_type(std::string s, mons_spec &spec) const " zombie", " skeleton", " simulacrum", NULL }; - // This order must match zombie_types, indexed from one. + // This order must match zombie_types, indexed from one. static const monster_type zombie_montypes[][2] = { { MONS_PROGRAM_BUG, MONS_PROGRAM_BUG }, @@ -2076,7 +2076,7 @@ void mons_list::get_zombie_type(std::string s, mons_spec &spec) const s = s.substr(0, s.length() - strlen(zombie_types[mod - 1])); trim_string(s); - + spec.monnum = get_monster_by_name(s, true); const int zombie_size = mons_zombie_size(spec.monnum); diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 64b70878e4..f20ff790a3 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -478,7 +478,6 @@ int mons_zombie_size(int mc) return (smc->zombie_size); } // end mons_zombie_size() - int mons_weight(int mc) { return (smc->weight); @@ -588,7 +587,7 @@ bool mons_see_invis(const monsters *mon) } // end mons_see_invis() -// This does NOT do line of sight! It checks the targ's visibility +// This does NOT do line of sight! It checks the targ's visibility // with respect to mon's perception, but doesn't do walls or range. bool mons_monster_visible( const monsters *mon, const monsters *targ ) { @@ -601,7 +600,7 @@ bool mons_monster_visible( const monsters *mon, const monsters *targ ) return (true); } -// This does NOT do line of sight! It checks the player's visibility +// This does NOT do line of sight! It checks the player's visibility // with respect to mon's perception, but doesn't do walls or range. bool mons_player_visible( const monsters *mon ) { @@ -3442,7 +3441,7 @@ bool monsters::fumbles_attack(bool verbose) if (mons_is_submerged(this)) return (true); - + return (false); } diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index ad07b566d4..c4bf18a5d5 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -4410,7 +4410,7 @@ static void handle_monster_move(int i, monsters *monster) } handle_behaviour(monster); - + // submerging monsters will hide from clouds if (monster_can_submerge(monster, grd[monster->x][monster->y]) && env.cgrid[monster->x][monster->y] != EMPTY_CLOUD) -- cgit v1.2.3-54-g00ecf