summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/directn.cc2
-rw-r--r--crawl-ref/source/effects.cc2
-rw-r--r--crawl-ref/source/l_dgn.cc6
-rw-r--r--crawl-ref/source/macro.cc2
-rw-r--r--crawl-ref/source/mon-abil.cc2
-rw-r--r--crawl-ref/source/mon-pathfind.h4
-rw-r--r--crawl-ref/source/mon-util.cc2
-rw-r--r--crawl-ref/source/show.cc2
-rw-r--r--crawl-ref/source/tilereg.cc2
-rw-r--r--crawl-ref/source/tutorial.cc6
-rw-r--r--crawl-ref/source/tutorial.h2
-rw-r--r--crawl-ref/source/view.cc2
12 files changed, 17 insertions, 17 deletions
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 1a9ec50efa..3ff8e04cb6 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -317,7 +317,7 @@ static bool _mon_exposed_in_cloud(const monsters *mon)
if (!mon)
return (false);
- return (!mon->visible_to(&you)
+ return (!mon->visible_to(&you)
&& is_opaque_cloud(env.cgrid(mon->pos()))
&& !mons_is_insubstantial(mon->type));
}
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 063b1db69e..d8421bc99e 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -322,7 +322,7 @@ int torment_monsters(coord_def where, int pow, int caster, actor *attacker)
// because it can't kill them, and because hostile monsters use
// it. It does alert them, though.
// XXX: attacker isn't passed through "int torment()".
- behaviour_event(monster, ME_ALERT,
+ behaviour_event(monster, ME_ALERT,
attacker ? attacker->mindex() : MHITNOT);
}
diff --git a/crawl-ref/source/l_dgn.cc b/crawl-ref/source/l_dgn.cc
index cef4fd1acd..0a464d6bc9 100644
--- a/crawl-ref/source/l_dgn.cc
+++ b/crawl-ref/source/l_dgn.cc
@@ -1589,17 +1589,17 @@ LUAFN(dgn_fill_grd_area)
int x2 = luaL_checkint(ls, 3);
int y2 = luaL_checkint(ls, 4);
dungeon_feature_type feat = check_lua_feature(ls, 5);
-
+
x1 = std::min(std::max(x1, X_BOUND_1+1), X_BOUND_2-1);
y1 = std::min(std::max(y1, Y_BOUND_1+1), Y_BOUND_2-1);
x2 = std::min(std::max(x2, X_BOUND_1+1), X_BOUND_2-1);
y2 = std::min(std::max(y2, Y_BOUND_1+1), Y_BOUND_2-1);
-
+
if (x2 < x1)
std::swap(x1, x2);
if (y2 < y1)
std::swap(y1, y2);
-
+
for (int y = y1; y <= y2; y++)
for (int x = x1; x <= x2; x++)
grd[x][y] = feat;
diff --git a/crawl-ref/source/macro.cc b/crawl-ref/source/macro.cc
index 3e0e665b93..60c3e223e3 100644
--- a/crawl-ref/source/macro.cc
+++ b/crawl-ref/source/macro.cc
@@ -1128,7 +1128,7 @@ command_type key_to_command(int key, KeymapContext context)
return (CMD_NO_CMD);
}
-
+
return (cmd);
}
diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc
index c2acf0ef22..bf1ed3af9e 100644
--- a/crawl-ref/source/mon-abil.cc
+++ b/crawl-ref/source/mon-abil.cc
@@ -751,7 +751,7 @@ static inline void _mons_cast_abil(monsters *monster, bolt &pbolt,
{
mons_cast(monster, pbolt, spell_cast, true, true);
}
-
+
//---------------------------------------------------------------
//
// mon_special_ability
diff --git a/crawl-ref/source/mon-pathfind.h b/crawl-ref/source/mon-pathfind.h
index 590fb3f777..2741612de5 100644
--- a/crawl-ref/source/mon-pathfind.h
+++ b/crawl-ref/source/mon-pathfind.h
@@ -10,8 +10,8 @@ class monster_pathfind
public:
monster_pathfind();
virtual ~monster_pathfind();
-
- // public methods
+
+ // public methods
void set_range(int r);
coord_def next_pos(const coord_def &p) const;
bool init_pathfind(const monsters *mon, coord_def dest,
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 0c8ff6d0b0..db8d05c2ac 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -707,7 +707,7 @@ monster_type mons_genus(int mc)
monster_type mons_detected_base(monster_type mc)
{
return (monster_symbols[mc].detected);
-}
+}
monster_type draco_subspecies(const monsters *mon)
{
diff --git a/crawl-ref/source/show.cc b/crawl-ref/source/show.cc
index 498e7c05e0..7694fd8c0f 100644
--- a/crawl-ref/source/show.cc
+++ b/crawl-ref/source/show.cc
@@ -323,7 +323,7 @@ void show_def::_update_monster(const monsters* mons)
grid(e).colour = ripple_table[base_colour & 0x0f];
}
- else if (is_opaque_cloud(env.cgrid(pos)) &&
+ else if (is_opaque_cloud(env.cgrid(pos)) &&
!mons->submerged() &&
!mons_is_insubstantial(mons->type))
{
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc
index 7fe0b2644c..2c882f9ce9 100644
--- a/crawl-ref/source/tilereg.cc
+++ b/crawl-ref/source/tilereg.cc
@@ -1632,7 +1632,7 @@ int DungeonRegion::handle_mouse(MouseEvent &event)
else
return (CK_MOUSE_CMD);
}
-
+
return _click_travel(gc, event);
}
diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc
index fc18dad09e..e1be483bf9 100644
--- a/crawl-ref/source/tutorial.cc
+++ b/crawl-ref/source/tutorial.cc
@@ -3651,11 +3651,11 @@ void tutorial_describe_item(const item_def &item)
"this tile of the ammo you want to fire, and then "
"<w>left mouse click</w> on the monster you want "
"to hit.\n\n"
-
+
"To launch this ammo using the keyboard, you can "
"simply ";
-#endif
-
+#endif
+
ostr << "<w>f</w>ire "
<< (item.quantity > 1 ? "these" : "this")
<< " " << item.name(DESC_BASENAME)
diff --git a/crawl-ref/source/tutorial.h b/crawl-ref/source/tutorial.h
index cf90e840a7..679991ff94 100644
--- a/crawl-ref/source/tutorial.h
+++ b/crawl-ref/source/tutorial.h
@@ -27,7 +27,7 @@ enum tutorial_types
TUT_RANGER_CHAR,
TUT_TYPES_NUM // 3
};
-
+
void save_tutorial(writer& outf);
void load_tutorial(reader& inf);
void init_tutorial_options(void);
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index cb97bd8ad9..1feaeb3a4f 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -740,7 +740,7 @@ void tile_draw_floor()
{
dungeon_feature_type feat = grid_appearance(gc);
bg = tileidx_feature(feat, gc.x, gc.y);
-
+
if (feat == DNGN_DETECTED_SECRET_DOOR)
bg |= TILE_FLAG_WAS_SECRET;
else if (is_unknown_stair(gc))