Add whitespace fixes.

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

33 files changed, 159 insertions, 159 deletions

diff --git a/crawl-ref/source/Kills.h b/crawl-ref/source/Kills.h
index 897725df76..b610d41c86 100644
--- a/crawl-ref/source/Kills.h
+++ b/crawl-ref/source/Kills.h
@@ -41,10 +41,10 @@ struct kill_monster_desc
 
     struct less_than
     {
-        bool operator () ( const kill_monster_desc &m1, 
+        bool operator () ( const kill_monster_desc &m1,
                            const kill_monster_desc &m2) const
         {
-            return m1.monnum < m2.monnum || 
+            return m1.monnum < m2.monnum ||
                 (m1.monnum == m2.monnum && m1.modifier < m2.modifier);
         }
     };
@@ -74,10 +74,10 @@ public:
     unsigned short kills;           // How many kills does the player have?
     int            exp;             // Experience gained for slaying the beast.
                                     // Only set *once*, even for shapeshifters.
-    
+
     std::vector<unsigned short> places; // Places where we've killed the beast.
 private:
-    std::string append_places(const kill_monster_desc &md, 
+    std::string append_places(const kill_monster_desc &md,
             const std::string &name) const;
 };
 
@@ -110,9 +110,9 @@ struct kill_exp
     int modifier;     // Nature of the beast
 
     std::vector<unsigned short> places;
-    
+
     kill_exp(const kill_def &k, const kill_monster_desc &md)
-        : nkills(k.kills), exp(k.exp), base_name(k.base_name(md)), 
+        : nkills(k.kills), exp(k.exp), base_name(k.base_name(md)),
           desc(k.info(md)),
           monnum(md.monnum), modifier(md.modifier)
     {
@@ -125,7 +125,7 @@ struct kill_exp
     {
         places.push_back(kg.place);
     }
-    
+
     // operator< is implemented for a descending sort.
     bool operator < ( const kill_exp &b) const
     {
@@ -145,11 +145,11 @@ public:
 
     long get_kills(std::vector<kill_exp> &v) const;
 private:
-    typedef std::map<kill_monster_desc, 
-                     kill_def, 
+    typedef std::map<kill_monster_desc,
+                     kill_def,
                      kill_monster_desc::less_than> kill_map;
     typedef std::vector<kill_ghost> ghost_vec;
-    
+
     kill_map    kills;
     ghost_vec   ghosts;
 
diff --git a/crawl-ref/source/defines.h b/crawl-ref/source/defines.h
index 6073417699..52d805cd60 100644
--- a/crawl-ref/source/defines.h
+++ b/crawl-ref/source/defines.h
@@ -314,7 +314,7 @@ enum GotoRegion
 };
 
 // Mouse modes (for tiles)
-enum mouse_mode 
+enum mouse_mode
 {
      MOUSE_MODE_NORMAL,
      MOUSE_MODE_COMMAND,
diff --git a/crawl-ref/source/dgnevent.cc b/crawl-ref/source/dgnevent.cc
index 3bfcc22f85..d6848a8039 100644
--- a/crawl-ref/source/dgnevent.cc
+++ b/crawl-ref/source/dgnevent.cc
@@ -2,9 +2,9 @@
  *  File:       dgnevent.cc
  *  Summary:    General dungeon events.
  *  Created by: dshaligram on Sat Jul 21 12:17:29 2007 UTC
- *  
+ *
  *  Modified for Crawl Reference by $Author$ on $Date$
- *  
+ *
  */
 
 #include "AppHdr.h"
@@ -50,7 +50,7 @@ void dgn_event_dispatcher::fire_position_event(
 void dgn_event_dispatcher::fire_position_event(
     const dgn_event &et, const coord_def &pos)
 {
-    dgn_square_alarm *alarm = grid_triggers[pos.x][pos.y].get();    
+    dgn_square_alarm *alarm = grid_triggers[pos.x][pos.y].get();
     if (alarm && (alarm->eventmask & et.type))
     {
         dgn_square_alarm alcopy = *alarm;
diff --git a/crawl-ref/source/dgnevent.h b/crawl-ref/source/dgnevent.h
index 168bdeaaa2..fdafe892aa 100644
--- a/crawl-ref/source/dgnevent.h
+++ b/crawl-ref/source/dgnevent.h
@@ -4,7 +4,7 @@
  *  Created by: dshaligram on Sat Jul 21 12:17:29 2007 UTC
  *
  *  Modified for Crawl Reference by $Author$ on $Date$
- *  
+ *
  */
 
 #ifndef __DGNEVENT_H__
@@ -17,7 +17,7 @@
 enum dgn_event_type
 {
     DET_NONE            = 0x0000,
-    
+
     DET_TURN_ELAPSED    = 0x0001,
     DET_MONSTER_MOVED   = 0x0002,
     DET_PLAYER_MOVED    = 0x0004,
@@ -63,7 +63,7 @@ struct dgn_square_alarm
 {
 public:
     dgn_square_alarm() : eventmask(0), listeners() { }
-    
+
 public:
     unsigned eventmask;
     std::list<dgn_event_listener*> listeners;
@@ -96,7 +96,7 @@ public:
     void clear_listeners_at(const coord_def &pos);
     bool has_listeners_at(const coord_def &pos) const;
     void move_listeners(const coord_def &from, const coord_def &to);
-    
+
     void fire_position_event(dgn_event_type et, const coord_def &pos);
     void fire_position_event(const dgn_event &e, const coord_def &pos);
     void fire_event(dgn_event_type et);
@@ -110,7 +110,7 @@ private:
     void register_listener_at(unsigned mask, const coord_def &pos,
                               dgn_event_listener *l);
     void remove_listener_at(const coord_def &pos, dgn_event_listener *l);
-    
+
 private:
     unsigned global_event_mask;
     std::auto_ptr<dgn_square_alarm> grid_triggers[GXM][GYM];
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index 5c12ab79e5..16e3ebd002 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -1624,7 +1624,7 @@ static located_feature_list _save_critical_features()
 {
     located_feature_list result;
 
-    for (rectangle_iterator ri(1); ri; ++ri) 
+    for (rectangle_iterator ri(1); ri; ++ri)
         if (_is_critical_feature(grd(*ri)))
             result.push_back(located_feature(*ri, grd(*ri)));
 
diff --git a/crawl-ref/source/dungeon.h b/crawl-ref/source/dungeon.h
index 3821dadbf0..e47022083d 100644
--- a/crawl-ref/source/dungeon.h
+++ b/crawl-ref/source/dungeon.h
@@ -341,7 +341,7 @@ struct spec_room
 {
     bool created;
     bool hooked_up;
-    
+
     coord_def tl;
     coord_def br;
 
diff --git a/crawl-ref/source/ghost.cc b/crawl-ref/source/ghost.cc
index 5d6547bf2c..97bcca30a5 100644
--- a/crawl-ref/source/ghost.cc
+++ b/crawl-ref/source/ghost.cc
@@ -317,7 +317,7 @@ void ghost_demon::init_player_ghost()
             if (weapon.base_type == OBJ_WEAPONS)
             {
                 brand = static_cast<brand_type>(get_weapon_brand(weapon));
-                
+
                 // Ghosts can't get holy wrath, but they get to keep
                 // the weapon.
                 if ( brand == SPWPN_HOLY_WRATH )
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index 5dd451e4e2..ea1cceb468 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -1024,10 +1024,10 @@ bool origin_is_god_gift(const item_def& item)
 {
     if (!origin_describable(item))
         return false;
-    
+
     if (_origin_is_original_equip(item))
         return false;
-    
+
     if (item.orig_monnum >= 0)
         return false;
 
diff --git a/crawl-ref/source/libgui.h b/crawl-ref/source/libgui.h
index 7e1018f1d7..083d70321f 100644
--- a/crawl-ref/source/libgui.h
+++ b/crawl-ref/source/libgui.h
@@ -32,7 +32,7 @@ void clrscr(void);
 void textcolor(int color);
 int wherex();
 int wherey();
-void cprintf(const char *format,...);    
+void cprintf(const char *format,...);
 void clear_to_end_of_line(void);
 void clear_to_end_of_screen(void);
 int get_number_of_lines(void);
diff --git a/crawl-ref/source/libutil.h b/crawl-ref/source/libutil.h
index 6ed7838811..e3a0f06105 100644
--- a/crawl-ref/source/libutil.h
+++ b/crawl-ref/source/libutil.h
@@ -1,6 +1,6 @@
 /*
  *  File:       libutil.h
- *  Summary:    System independent functions 
+ *  Summary:    System independent functions
  *
  *  Modified for Crawl Reference by $Author$ on $Date$
  */
@@ -108,9 +108,9 @@ inline bool ends_with(const std::string &s, const std::string &suffix)
 // remainder of the string as the last segment; negative values of nsplits
 // split on all occurrences of the separator.
 std::vector<std::string> split_string(
-    const std::string &sep, 
-    std::string s, 
-    bool trim = true, 
+    const std::string &sep,
+    std::string s,
+    bool trim = true,
     bool accept_empties = false,
     int nsplits = -1);
 
@@ -189,7 +189,7 @@ public:
     {
         return oldval;
     }
-    
+
 private:
     T &val;
     T oldval;
@@ -210,7 +210,7 @@ template <p_compile pcomp, p_free pfree, p_match pmatch>
 class basic_text_pattern : public base_pattern
 {
 public:
-    basic_text_pattern(const std::string &s, bool icase = false) 
+    basic_text_pattern(const std::string &s, bool icase = false)
         : pattern(s), compiled_pattern(NULL),
           isvalid(true), ignore_case(icase)
     {
@@ -302,7 +302,7 @@ public:
     {
         return pattern;
     }
-    
+
 private:
     std::string pattern;
     mutable void *compiled_pattern;
@@ -333,7 +333,7 @@ public:
     {
         ms_current_mode = m_previous_mode;
     }
-    
+
     static mouse_mode current_mode() { return ms_current_mode; }
 
 private:
diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc
index a0d80ead9d..523c18efaf 100644
--- a/crawl-ref/source/monplace.cc
+++ b/crawl-ref/source/monplace.cc
@@ -2171,7 +2171,7 @@ bool empty_surrounds(const coord_def& where, dungeon_feature_type spc_wanted,
 
         if ( *ri == you.pos() )
             continue;
-        
+
         if (mgrd(*ri) != NON_MONSTER)
             continue;
 
@@ -2181,7 +2181,7 @@ bool empty_surrounds(const coord_def& where, dungeon_feature_type spc_wanted,
 
         success =
             (grd(*ri) == spc_wanted) || grid_compatible(spc_wanted, grd(*ri));
-        
+
         if (success && one_chance_in(++good_count))
             empty = *ri;
     }
diff --git a/crawl-ref/source/mt19937ar.h b/crawl-ref/source/mt19937ar.h
index 3e8948ee6a..f3267c4195 100644
--- a/crawl-ref/source/mt19937ar.h
+++ b/crawl-ref/source/mt19937ar.h
@@ -1,12 +1,12 @@
-/* 
+/*
    A C-program for MT19937, with initialization improved 2002/1/26.
    Coded by Takuji Nishimura and Makoto Matsumoto.
 
-   Before using, initialize the state by using init_genrand(seed)  
+   Before using, initialize the state by using init_genrand(seed)
    or init_by_array(init_key, key_length).
 
    Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
-   All rights reserved.                          
+   All rights reserved.
 
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
@@ -19,8 +19,8 @@
         notice, this list of conditions and the following disclaimer in the
         documentation and/or other materials provided with the distribution.
 
-     3. The names of its contributors may not be used to endorse or promote 
-        products derived from this software without specific prior written 
+     3. The names of its contributors may not be used to endorse or promote
+        products derived from this software without specific prior written
         permission.
 
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index 258d8a69d8..c41e5a1709 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -280,7 +280,7 @@ bool brand_weapon(brand_type which_brand, int power)
     // Can't rebrand a temporarily-branded item to a different brand.
     if (temp_brand && (get_weapon_brand(weapon) != which_brand))
         return (false);
-    
+
     std::string msg = weapon.name(DESC_CAP_YOUR);
     const int wpn_type = get_vorpal_type(weapon);
 
@@ -681,7 +681,7 @@ void cast_refrigeration(int pow)
     }
 
     // Now damage the creatures.
-    
+
     // Set up the cold attack.
     bolt beam;
     beam.flavour = BEAM_COLD;
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 859f26e28d..e383ebccb6 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -951,7 +951,7 @@ beam_type _spell_to_beam_type(spell_type spell)
 int _setup_evaporate_cast()
 {
     int rc = prompt_invent_item("Throw which potion?", MT_INVLIST, OBJ_POTIONS);
-    
+
     if (prompt_failed(rc))
     {
         rc = -1;
@@ -1144,7 +1144,7 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
             return (SPRET_ABORT);
         }
         break;
-        
+
     // direct beams/bolts
     case SPELL_MAGIC_DART:
         if (!zapping(ZAP_MAGIC_DARTS, powc, beam, true))
diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h
index e5d629e789..b01d3acf13 100644
--- a/crawl-ref/source/spl-data.h
+++ b/crawl-ref/source/spl-data.h
@@ -894,7 +894,7 @@
      SPTYP_ENCHANTMENT,
      SPFLAG_DIR_OR_TARGET | SPFLAG_NOT_SELF,
      4,
-     200,        
+     200,
         LOS_RADIUS, LOS_RADIUS,
      NULL,
      true,
diff --git a/crawl-ref/source/sqldbm.cc b/crawl-ref/source/sqldbm.cc
index db6c1f0606..68f798261b 100644
--- a/crawl-ref/source/sqldbm.cc
+++ b/crawl-ref/source/sqldbm.cc
@@ -2,7 +2,7 @@
  *  File:       sqldbm.cc
  *  Summary:    dbm wrapper for SQLite
  *  Written by: Darshan Shaligram
- *  
+ *
  *  Modified for Crawl Reference by $Author$ on $Date$
  */
 
@@ -49,12 +49,12 @@ int SQL_DBM::open(const std::string &s)
 
     if (!s.empty())
         dbfile = s;
-    
+
     if (!dbfile.empty())
     {
         if (dbfile.find(".db") != dbfile.length() - 3)
             dbfile += ".db";
-        
+
         if (ec( sqlite3_open(dbfile.c_str(), &db) ) != SQLITE_OK)
         {
             std::string saveerr = error;
@@ -140,7 +140,7 @@ std::string SQL_DBM::query(const std::string &key)
     std::string res;
     while ((err = ec(sqlite3_step(s_query))) == SQLITE_ROW)
         res = (const char *) sqlite3_column_text(s_query, 0);
-    
+
     sqlite3_reset(s_query);
 
     return (res);
@@ -150,7 +150,7 @@ std::auto_ptr<std::string> SQL_DBM::firstkey()
 {
     if (init_iterator() != SQLITE_OK)
     {
-        std::auto_ptr<std::string> result;        
+        std::auto_ptr<std::string> result;
         return (result);
     }
 
@@ -159,7 +159,7 @@ std::auto_ptr<std::string> SQL_DBM::firstkey()
 
 std::auto_ptr<std::string> SQL_DBM::nextkey()
 {
-    std::auto_ptr<std::string> result;        
+    std::auto_ptr<std::string> result;
     if (s_iterator)
     {
         int err = SQLITE_OK;
@@ -170,7 +170,7 @@ std::auto_ptr<std::string> SQL_DBM::nextkey()
         else
             sqlite3_reset(s_iterator);
     }
-    return (result);    
+    return (result);
 }
 
 int SQL_DBM::init_query()
diff --git a/crawl-ref/source/sqldbm.h b/crawl-ref/source/sqldbm.h
index 38078483b1..07a03550d1 100644
--- a/crawl-ref/source/sqldbm.h
+++ b/crawl-ref/source/sqldbm.h
@@ -38,13 +38,13 @@ public:
     virtual ~sql_datum();
 
     sql_datum &operator = (const sql_datum &other);
-    
+
     std::string to_str() const;
 
 public:
     char   *dptr;    // Canonically void*, but we're not a real Berkeley DB.
     size_t dsize;
-    
+
 private:
     bool   need_free;
 
@@ -61,13 +61,13 @@ public:
     ~SQL_DBM();
 
     bool is_open() const;
-    
+
     int open(const std::string &db = "");
     void close();
-    
+
     std::auto_ptr<std::string> firstkey();
     std::auto_ptr<std::string> nextkey();
-    
+
     std::string query(const std::string &key);
     int insert(const std::string &key, const std::string &value);
 
@@ -83,7 +83,7 @@ private:
     int init_insert();
     int init_schema();
     int ec(int err);
-        
+
 private:
     sqlite3      *db;
     sqlite3_stmt *s_insert;
diff --git a/crawl-ref/source/stash.h b/crawl-ref/source/stash.h
index 40c0d31d5c..0c72c07532 100644
--- a/crawl-ref/source/stash.h
+++ b/crawl-ref/source/stash.h
@@ -31,7 +31,7 @@ enum STASH_TRACK_MODES
 {
     STM_NONE,             // Stashes are not tracked
     STM_EXPLICIT,         // Only explicitly marked stashes are tracked
-    STM_DROPPED,          // Dropped items and explicitly marked stashes are 
+    STM_DROPPED,          // Dropped items and explicitly marked stashes are
                           // tracked
     STM_ALL               // All seen items are tracked
 };
@@ -65,7 +65,7 @@ public:
     bool unverified() const;
 
     bool matches_search(const std::string &prefix,
-                        const base_pattern &search, 
+                        const base_pattern &search,
                         stash_search_result &res)
             const;
 
@@ -99,7 +99,7 @@ private:
     int  abspos;
     dungeon_feature_type feat;
     trap_type trap;
-    
+
     std::vector<item_def>   items;
 
     /*
@@ -123,8 +123,8 @@ public:
     ShopInfo(int xp, int yp);
 
     bool matches_search(const std::string &prefix,
-                        const base_pattern &search, 
-                        stash_search_result &res) 
+                        const base_pattern &search,
+                        stash_search_result &res)
             const;
 
     std::string description() const;
@@ -181,7 +181,7 @@ struct stash_search_result
     // Count of items stacks in the stash that matched. This will be the same as
     // matches if each matching stack's quantity is 1.
     int count;
-    
+
     // Text that describes this search result - usually the name of
     // the first matching item in the stash or the name of the shop.
     std::string match;
@@ -194,7 +194,7 @@ struct stash_search_result
                             count(0), match(), stash(NULL), shop(NULL)
     {
     }
-    
+
     bool operator < ( const stash_search_result &ssr ) const
     {
         return player_distance < ssr.player_distance ||
@@ -216,7 +216,7 @@ public:
     const ShopInfo *find_shop(int x, int y) const;
 
     level_id where() const;
-    
+
     void get_matching_stashes(const base_pattern &search,
                               std::vector<stash_search_result> &results) const;
 
@@ -235,7 +235,7 @@ public:
         return shop_needs_visit(c.x, c.y);
     }
 
-    // Add stash at (x,y), or player's current location if no parameters are 
+    // Add stash at (x,y), or player's current location if no parameters are
     // supplied
     void  add_stash(int x = -1, int y = -1);
 
@@ -264,7 +264,7 @@ public:
  private:
     typedef std::map<int, Stash>  stashes_t;
     typedef std::vector<ShopInfo> shops_t;
-    
+
     // which level
     level_id m_place;
     stashes_t m_stashes;
@@ -295,7 +295,7 @@ public:
     LevelStashes *find_level(const level_id &pos);
 
     ShopInfo &get_shop(int x, int y)
-    { 
+    {
         return get_current_level().get_shop(x, y);
     }
 
@@ -309,8 +309,8 @@ public:
     enum stash_update_mode
     {
         ST_PASSIVE,             // Maintain existing stashes only.
-        ST_AGGRESSIVE           // Create stashes for each square containing 
-                                // objects, even if those squares were not 
+        ST_AGGRESSIVE           // Create stashes for each square containing
+                                // objects, even if those squares were not
                                 // previously marked as stashes.
     };
 
@@ -319,11 +319,11 @@ public:
     void update_visible_stashes(StashTracker::stash_update_mode = ST_PASSIVE);
 
     // Update stash at (x,y) on current level, defaulting to player's current
-    // location if no parameters are supplied, return true if a stash was 
+    // location if no parameters are supplied, return true if a stash was
     // updated.
     bool update_stash(int x = -1, int y = -1);
 
-    // Add stash at (x,y), or player's current location if no parameters are 
+    // Add stash at (x,y), or player's current location if no parameters are
     // supplied
     void add_stash(int x = -1, int y = -1, bool verbose = false);
 
@@ -339,7 +339,7 @@ public:
     void dump(const char *filename, bool identify = false) const;
 
 private:
-    void get_matching_stashes(const base_pattern &search, 
+    void get_matching_stashes(const base_pattern &search,
                               std::vector<stash_search_result> &results) const;
     bool display_search_results(std::vector<stash_search_result> &results,
                                 const char* sort_style);
diff --git a/crawl-ref/source/stuff.h b/crawl-ref/source/stuff.h
index 93c655383c..3c6818776c 100644
--- a/crawl-ref/source/stuff.h
+++ b/crawl-ref/source/stuff.h
@@ -79,7 +79,7 @@ public:
     const coord_def* operator->() const;
 
     rectangle_iterator& operator ++ ();
-    rectangle_iterator operator ++ (int);    
+    rectangle_iterator operator ++ (int);
 private:
     coord_def current, topleft, bottomright;
 };
diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc
index 0e30d75aa3..9df9fccc26 100644
--- a/crawl-ref/source/tags.cc
+++ b/crawl-ref/source/tags.cc
@@ -2275,7 +2275,7 @@ static void tag_missing_level_tiles()
 
     TileNewLevel(true);
 
-    
+
 #endif
 }
 
diff --git a/crawl-ref/source/tilefont.cc b/crawl-ref/source/tilefont.cc
index 720ac7b310..77de04e2a1 100644
--- a/crawl-ref/source/tilefont.cc
+++ b/crawl-ref/source/tilefont.cc
@@ -68,7 +68,7 @@ bool FTFont::load_font(const char *font_name, unsigned int font_size)
         fprintf(stderr, "Could not find font '%s'\n", font_name);
         return false;
     }
-    
+
     error = FT_New_Face(library, font_path.c_str(), 0, &face);
     if (error == FT_Err_Unknown_File_Format)
     {
@@ -161,7 +161,7 @@ bool FTFont::load_font(const char *font_name, unsigned int font_size)
                 pixels[idx + 1] = 255;
                 pixels[idx + 2] = 255;
                 pixels[idx + 3] = 255;
-            }    
+            }
     }
 
     for (unsigned int c = 1; c < 256; c++)
@@ -203,7 +203,7 @@ bool FTFont::load_font(const char *font_name, unsigned int font_size)
                 pixels[idx + 1] = 255;
                 pixels[idx + 2] = 255;
                 pixels[idx + 3] = alpha;
-            }    
+            }
     }
 
     bool success = m_tex.load_texture(pixels, width, height,
@@ -244,7 +244,7 @@ void FTFont::render_textblock(unsigned int x_pos, unsigned int y_pos,
     verts.reserve(4 * width * height);
 
     float texcoord_dy = (float)m_max_advance.y / (float)m_tex.height();
-   
+
     for (unsigned int y = 0; y < height; y++)
     {
         for (unsigned int x = 0; x < width; x++)
@@ -403,7 +403,7 @@ static void _draw_box(int x_pos, int y_pos, float width, float height,
 
     glVertexPointer(2, GL_FLOAT, sizeof(box_vert), &verts[0].x);
     glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(box_vert), &verts[0].r);
-    glDrawArrays(GL_QUADS, 0, sizeof(verts) / sizeof(box_vert)); 
+    glDrawArrays(GL_QUADS, 0, sizeof(verts) / sizeof(box_vert));
 
 }
 
@@ -412,7 +412,7 @@ unsigned int FTFont::string_width(const char *text)
     unsigned int base_width = std::max(-m_min_offset, 0);
     unsigned int max_width = 0;
 
-    unsigned int width = 0; 
+    unsigned int width = 0;
     unsigned int adjust = 0;
     for (const char *itr = text; *itr; itr++)
     {
diff --git a/crawl-ref/source/tilefont.h b/crawl-ref/source/tilefont.h
index b3e0a4b514..d87ea6b53b 100644
--- a/crawl-ref/source/tilefont.h
+++ b/crawl-ref/source/tilefont.h
@@ -19,7 +19,7 @@
 // * handling kerning
 //
 // * the possibility of streaming this class in and out so that Crawl doesn't
-//   have to link against FreeType2 or be forced do as much processing at 
+//   have to link against FreeType2 or be forced do as much processing at
 //   load time.
 
 class FTFont
diff --git a/crawl-ref/source/tilemcache.cc b/crawl-ref/source/tilemcache.cc
index 9d3397bb96..46cdc3c023 100644
--- a/crawl-ref/source/tilemcache.cc
+++ b/crawl-ref/source/tilemcache.cc
@@ -49,7 +49,7 @@ static void marshallDemon(writer &th, const demon_data &demon)
 }
 
 // Internal mcache classes.  The mcache_manager creates these internally.
-// The only access external clients need is through the virtual 
+// The only access external clients need is through the virtual
 // info function.
 
 class mcache_monster : public mcache_entry
@@ -168,19 +168,19 @@ unsigned int mcache_manager::register_monster(const monsters *mon)
 
     if (mcache_demon::valid(mon))
     {
-        entry = new mcache_demon(mon);        
+        entry = new mcache_demon(mon);
     }
     else if (mcache_ghost::valid(mon))
     {
-        entry = new mcache_ghost(mon);        
+        entry = new mcache_ghost(mon);
     }
     else if (mcache_draco::valid(mon))
     {
-        entry = new mcache_draco(mon);        
+        entry = new mcache_draco(mon);
     }
     else if (mcache_monster::valid(mon))
     {
-        entry = new mcache_monster(mon);        
+        entry = new mcache_monster(mon);
     }
     else
     {
@@ -214,7 +214,7 @@ void mcache_manager::clear_nonref()
     {
         if (!m_entries[i] || m_entries[i]->ref_count() > 0)
             continue;
-        
+
         delete m_entries[i];
         m_entries[i] = NULL;
     }
@@ -247,7 +247,7 @@ void mcache_manager::read(reader &th)
     unsigned int size = unmarshallLong(th);
     m_entries.reserve(size);
     m_entries.clear();
-    
+
     for (unsigned int i = 0; i < size; i++)
     {
         char type = unmarshallByte(th);
@@ -513,7 +513,7 @@ unsigned int mcache_monster::info(tile_draw_info *dinfo) const
                 eq2 = TILEP_HAND2_SHORT_SWORD_SLANT;
                 break;
         };
-        
+
         dinfo[2].set(eq2, -ofs_x, ofs_y);
 
         return 3;
@@ -547,7 +547,7 @@ mcache_monster::mcache_monster(reader &th) : mcache_entry(th)
 void mcache_monster::construct(writer &th)
 {
     mcache_entry::construct(th);
-    
+
     marshallLong(th, m_mon_tile);
     marshallLong(th, m_equ_tile);
 }
@@ -623,7 +623,7 @@ unsigned int mcache_draco::info(tile_draw_info *dinfo) const
 
 bool mcache_draco::valid(const monsters *mon)
 {
-    return (mon && mon->type >= MONS_FIRST_DRACONIAN 
+    return (mon && mon->type >= MONS_FIRST_DRACONIAN
             && mon->type <= MONS_LAST_DRACONIAN);
 }
 
@@ -637,7 +637,7 @@ mcache_draco::mcache_draco(reader &th) : mcache_entry(th)
 void mcache_draco::construct(writer &th)
 {
     mcache_entry::construct(th);
-    
+
     marshallLong(th, m_mon_tile);
     marshallLong(th, m_job_tile);
     marshallLong(th, m_equ_tile);
diff --git a/crawl-ref/source/tilemcache.h b/crawl-ref/source/tilemcache.h
index 1138d2434c..cfc0845241 100644
--- a/crawl-ref/source/tilemcache.h
+++ b/crawl-ref/source/tilemcache.h
@@ -70,7 +70,7 @@ public:
     void construct(writer &th);
 
 protected:
-    std::vector<mcache_entry*> m_entries;  
+    std::vector<mcache_entry*> m_entries;
 };
 
 // The global monster cache.
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 5a24de239b..492acc1721 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -109,7 +109,7 @@ static int _bow_offset(const monsters *mon)
     int mon_wep = mon->inv[MSLOT_WEAPON];
     if (mon_wep == NON_ITEM)
         return 1;
-   
+
     switch (mitm[mon_wep].sub_type)
     {
     case WPN_BOW:
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc
index 8146aea9fe..83b94ba016 100644
--- a/crawl-ref/source/tilereg.cc
+++ b/crawl-ref/source/tilereg.cc
@@ -221,7 +221,7 @@ void DungeonRegion::load_dungeon(unsigned int* tileb, int cx_to_gx, int cy_to_gy
 
     unsigned int len = 2 * crawl_view.viewsz.x * crawl_view.viewsz.y;
     m_tileb.resize(len);
-    // TODO enne - move this function into dungeonregion 
+    // TODO enne - move this function into dungeonregion
     tile_finish_dngn(tileb, cx_to_gx + mx/2, cy_to_gy + my/2);
     memcpy(&m_tileb[0], tileb, sizeof(unsigned int) * len);
 
@@ -245,7 +245,7 @@ void TileRegion::add_quad(TextureID tex, unsigned int idx, unsigned int x, unsig
 
     float pos_sx = x;
     float pos_sy = y;
-    float pos_ex, pos_ey, tex_sx, tex_sy, tex_ex, tex_ey; 
+    float pos_ex, pos_ey, tex_sx, tex_sy, tex_ex, tex_ey;
     m_image->m_textures[tex].get_coords(idx, ofs_x, ofs_y,
                                         pos_sx, pos_sy, pos_ex, pos_ey,
                                         tex_sx, tex_sy, tex_ex, tex_ey,
@@ -317,7 +317,7 @@ void DungeonRegion::draw_player(unsigned int x, unsigned int y)
 
     int gender = you.your_name[0] % 2;
 
-    tilep_race_default(you.species, gender, you.experience_level, 
+    tilep_race_default(you.species, gender, you.experience_level,
                        default_doll.parts);
 
     result = default_doll;
@@ -934,7 +934,7 @@ void DungeonRegion::place_cursor(cursor_type type, const coord_def &gc)
         && type == CURSOR_MOUSE)
     {
         coord_def delta = gc - you.pos();
-        
+
         int ax = abs(delta.x);
         int ay = abs(delta.y);
 
@@ -974,23 +974,23 @@ bool DungeonRegion::update_tip_text(std::string& tip)
 
     if (m_cursor[CURSOR_MOUSE] == you.pos())
     {
-        tip = you.your_name; 
-        tip += " ("; 
-        tip += get_species_abbrev(you.species); 
-        tip += get_class_abbrev(you.char_class); 
-        tip += ")"; 
- 
-        if (igrd(m_cursor[CURSOR_MOUSE]) != NON_ITEM) 
-            tip += "\n[L-Click] Pick up items (g)"; 
+        tip = you.your_name;
+        tip += " (";
+        tip += get_species_abbrev(you.species);
+        tip += get_class_abbrev(you.char_class);
+        tip += ")";
+
+        if (igrd(m_cursor[CURSOR_MOUSE]) != NON_ITEM)
+            tip += "\n[L-Click] Pick up items (g)";
 
-        if (grid_stair_direction(grd(m_cursor[CURSOR_MOUSE])) != CMD_NO_CMD) 
-            tip += "\n[Shift-L-Click] use stairs (</>)"; 
+        if (grid_stair_direction(grd(m_cursor[CURSOR_MOUSE])) != CMD_NO_CMD)
+            tip += "\n[Shift-L-Click] use stairs (</>)";
 
-        // Character overview. 
-        tip += "\n[R-Click] Overview (%)"; 
+        // Character overview.
+        tip += "\n[R-Click] Overview (%)";
 
-        // Religion. 
-        if (you.religion != GOD_NO_GOD) 
+        // Religion.
+        if (you.religion != GOD_NO_GOD)
             tip += "\n[Shift-R-Click] Religion (^)";
     }
     else if (abs(m_cursor[CURSOR_MOUSE].x - you.pos().x) <= 1
@@ -1210,7 +1210,7 @@ void InventoryRegion::pack_verts()
             InventoryTile &item = m_items[i++];
 
             if (item.flag & TILEI_FLAG_FLOOR)
-                add_quad(TEX_DUNGEON, get_floor_tile_idx() 
+                add_quad(TEX_DUNGEON, get_floor_tile_idx()
                          + m_flavour[i] % get_num_floor_flavors(), x, y);
             else
                 add_quad(TEX_DUNGEON, TILE_ITEM_SLOT, x, y);
@@ -1661,14 +1661,14 @@ bool InventoryRegion::update_tip_text(std::string& tip)
         {
             tip += "\n[Shift-L-Click] Drop (d)";
         }
-        
+
     }
 
     return true;
 }
 
 MapRegion::MapRegion(unsigned int pixsz) :
-    m_buf(NULL), 
+    m_buf(NULL),
     m_far_view(false)
 {
     dx = pixsz;
@@ -2296,7 +2296,7 @@ void MessageRegion::render()
 
             glVertexPointer(2, GL_FLOAT, sizeof(box_vert), &verts[0].x);
             glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(box_vert), &verts[0].r);
-            glDrawArrays(GL_QUADS, 0, sizeof(verts) / sizeof(box_vert)); 
+            glDrawArrays(GL_QUADS, 0, sizeof(verts) / sizeof(box_vert));
         }
     }
 
@@ -2362,7 +2362,7 @@ static void _copy_onto(unsigned char *pixels, unsigned int width,
                 dest[1] = (src[1] * a + dest[1] * inv_a) / 255;
                 dest[2] = (src[2] * a + dest[2] * inv_a) / 255;
                 dest[3] = (src[3] * a + dest[3] * inv_a) / 255;
-                
+
                 dest += 4;
                 src += 4;
             }
@@ -2375,14 +2375,14 @@ static void _copy_onto(unsigned char *pixels, unsigned int width,
         {
             memcpy(dest, src, src_row_size);
 
-            dest += dest_row_size; 
+            dest += dest_row_size;
             src += src_row_size;
         }
     }
 }
 
 // Copy an image at inf from pixels into dest.
-static void _copy_into(unsigned char *dest, unsigned char *pixels, 
+static void _copy_into(unsigned char *dest, unsigned char *pixels,
                        unsigned int width,
                        unsigned int height, const tile_info &inf,
                        int ofs_x = 0, int ofs_y = 0)
@@ -2418,7 +2418,7 @@ static void _copy_into(unsigned char *dest, unsigned char *pixels,
     {
         memcpy(dest, src, src_width * 4);
 
-        dest += dest_row_size; 
+        dest += dest_row_size;
         src += src_row_size;
     }
 }
@@ -2459,7 +2459,7 @@ static bool _copy_under(unsigned char *pixels, unsigned int width,
     return true;
 }
 
-static bool _process_item_image(unsigned char *pixels, 
+static bool _process_item_image(unsigned char *pixels,
                                 unsigned int width, unsigned int height)
 {
     bool success = true;
@@ -2518,7 +2518,7 @@ bool ImageManager::load_item_texture()
     // is modified.  So, it cannot be loaded until after the item
     // description table has been initialised.
     GenericTexture::MipMapOptions mip = GenericTexture::MIPMAP_CREATE;
-    bool success = m_textures[TEX_DEFAULT].load_texture("main.png", mip, 
+    bool success = m_textures[TEX_DEFAULT].load_texture("main.png", mip,
                                                         &_process_item_image);
     m_textures[TEX_DEFAULT].set_info(TILE_MAIN_MAX, tile_main_info);
 
diff --git a/crawl-ref/source/tilereg.h b/crawl-ref/source/tilereg.h
index e427877672..b46a033945 100644
--- a/crawl-ref/source/tilereg.h
+++ b/crawl-ref/source/tilereg.h
@@ -255,8 +255,8 @@ protected:
 
     int get_buffer_index(const coord_def &gc);
     void to_screen_coords(const coord_def &gc, coord_def& pc) const;
-    
-    std::vector<unsigned int> m_tileb; 
+
+    std::vector<unsigned int> m_tileb;
     int m_cx_to_gx;
     int m_cy_to_gy;
     coord_def m_cursor[CURSOR_MAX];
diff --git a/crawl-ref/source/tiles.h b/crawl-ref/source/tiles.h
index f32c6ee1c5..e2252641d0 100644
--- a/crawl-ref/source/tiles.h
+++ b/crawl-ref/source/tiles.h
@@ -19,7 +19,7 @@
 enum tag_version
 {
     TILETAG_PRE_MCACHE = 71,
-    TILETAG_CURRENT = 72 
+    TILETAG_CURRENT = 72
 };
 
 struct dolls_data
diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc
index 95d2321555..e33cd882a9 100644
--- a/crawl-ref/source/tilesdl.cc
+++ b/crawl-ref/source/tilesdl.cc
@@ -155,7 +155,7 @@ bool TilesFramework::initialise()
         if (SDL_EnableKeyRepeat(delay, interval) != 0)
             printf("Failed to set key repeat mode: %s\n", SDL_GetError());
     }
-  
+
     unsigned int flags = SDL_OPENGL;
     if (Options.tile_full_screen)
         flags |= SDL_FULLSCREEN;
@@ -190,7 +190,7 @@ bool TilesFramework::initialise()
         return false;
     }
 
-    m_region_tile = new DungeonRegion(&m_image, m_fonts[lbl_font].font, 
+    m_region_tile = new DungeonRegion(&m_image, m_fonts[lbl_font].font,
                                       TILE_X, TILE_Y);
     m_region_map = new MapRegion(Options.tile_map_pixels);
     m_region_self_inv = new InventoryRegion(&m_image, m_fonts[lbl_font].font,
@@ -231,7 +231,7 @@ int TilesFramework::load_font(const char *font_file, int font_size,
         if (finfo.name == font_file && finfo.size == font_size)
             return i;
     }
-    
+
     if (!font->load_font(font_file, font_size))
     {
         delete font;
@@ -321,14 +321,14 @@ void TilesFramework::resize()
     glLoadIdentity();
 
     // For ease, vertex positions are pixel positions.
-    glOrtho(0, m_windowsz.x, m_windowsz.y, 0, 0, 100); 
+    glOrtho(0, m_windowsz.x, m_windowsz.y, 0, 0, 100);
 }
 
 static unsigned char _get_modifiers(SDL_keysym &keysym)
 {
     // keysym.mod can't be used to keep track of the modifier state.
     // If shift is hit by itself, this will not include KMOD_SHIFT.
-    // Instead, look for the key itself as a separate event. 
+    // Instead, look for the key itself as a separate event.
     switch (keysym.sym)
     {
     case SDLK_LSHIFT:
@@ -540,7 +540,7 @@ int TilesFramework::getch_ck()
         if (SDL_WaitEvent(&event))
         {
             ticks = SDL_GetTicks();
-          
+
             if (event.type != SDL_USEREVENT)
                 tiles.clear_text_tags(TAG_CELL_DESC);
 
@@ -552,12 +552,12 @@ int TilesFramework::getch_ck()
 
                 // If you hit a key, disable tooltips until the mouse
                 // is moved again.
-                m_last_tick_moved = ~0; 
+                m_last_tick_moved = ~0;
                 break;
 
             case SDL_KEYUP:
                 m_key_mod &= ~_get_modifiers(event.key.keysym);
-                m_last_tick_moved = ~0; 
+                m_last_tick_moved = ~0;
                 break;
 
             case SDL_MOUSEMOTION:
@@ -587,7 +587,7 @@ int TilesFramework::getch_ck()
                     mouse_event.held = m_buttons_held;
                     mouse_event.mod = m_key_mod;
                     key = handle_mouse(mouse_event);
-                    m_last_tick_moved = ticks; 
+                    m_last_tick_moved = ticks;
                 }
                 break;
 
@@ -599,14 +599,14 @@ int TilesFramework::getch_ck()
                     mouse_event.held = m_buttons_held;
                     mouse_event.mod = m_key_mod;
                     key = handle_mouse(mouse_event);
-                    m_last_tick_moved = ticks; 
+                    m_last_tick_moved = ticks;
                 }
                 break;
 
             case SDL_QUIT:
                 // TODO enne
                 exit(0);
-                
+
             case SDL_USEREVENT:
             default:
                 // This is only used to refresh the tooltip.
@@ -614,7 +614,7 @@ int TilesFramework::getch_ck()
             }
         }
 
-        bool show_tooltip = ((ticks - m_last_tick_moved 
+        bool show_tooltip = ((ticks - m_last_tick_moved
                                 > (unsigned int)Options.tile_tooltip_ms)
                                 && ticks > m_last_tick_moved);
 
@@ -623,7 +623,7 @@ int TilesFramework::getch_ck()
             tiles.clear_text_tags(TAG_CELL_DESC);
             if (m_tooltip.empty())
             {
-                for (unsigned int i = 0; 
+                for (unsigned int i = 0;
                     i < m_layers[m_active_layer].m_regions.size(); i++)
                 {
                     Region *reg = m_layers[m_active_layer].m_regions[i];
@@ -786,7 +786,7 @@ void TilesFramework::do_layout()
         inv_col = stat_col;
 
     m_region_self_inv->place(inv_col, m_region_map->ey, 0);
-    m_region_self_inv->resize_to_fit(m_windowsz.x - 
+    m_region_self_inv->resize_to_fit(m_windowsz.x -
                                      m_region_self_inv->sx,
                                      m_windowsz.y -
                                      m_region_self_inv->sy);
@@ -816,7 +816,7 @@ void TilesFramework::do_layout()
     m_region_menu_inv->place(0, m_region_crt->ey, margin);
     m_region_menu_inv->resize_to_fit(m_windowsz.x, m_windowsz.y -
                                      m_region_menu_inv->sy);
- 
+
     // Depending on the font, the menu inventory may hold fewer items
     // than the crt menu can display.  Decrease the lines if necessary.
     const int ex = 3;
@@ -921,7 +921,7 @@ void TilesFramework::redraw()
                             min_pos, m_windowsz, WHITE, false, 150,
                             BLUE, 5);
     }
-            
+
     SDL_GL_SwapBuffers();
 }
 
@@ -993,7 +993,7 @@ static void _fill_item_info(InventoryTile &desc, const item_def &item)
     desc.tile = tileidx_item(item);
 
     int type = item.base_type;
-    if (type == OBJ_FOOD || type == OBJ_SCROLLS 
+    if (type == OBJ_FOOD || type == OBJ_SCROLLS
         || type == OBJ_POTIONS || type == OBJ_MISSILES)
     {
         // -1 specifies don't display anything
@@ -1108,7 +1108,7 @@ void TilesFramework::update_inventory()
             }
 
             // Add extra rows, if needed.
-            unsigned int ground_rows = 
+            unsigned int ground_rows =
                 std::max(((int)num_ground-1) / (int)mx + 1, 1);
 
             while (inv.size() / mx + ground_rows < my)
@@ -1159,14 +1159,14 @@ void TilesFramework::update_inventory()
     m_region_self_inv->update(inv.size(), &inv[0]);
 }
 
-void TilesFramework::update_menu_inventory(unsigned int slot, 
-                                           const item_def &item, 
+void TilesFramework::update_menu_inventory(unsigned int slot,
+                                           const item_def &item,
                                            bool selected, char key)
 {
     InventoryTile desc;
     _fill_item_info(desc, item);
     desc.key = key;
-    desc.idx = (desc.flag & TILEI_FLAG_FLOOR) ? item.index() : 
+    desc.idx = (desc.flag & TILEI_FLAG_FLOOR) ? item.index() :
                                                 letter_to_index(key);
     if (selected)
         desc.flag |= TILEI_FLAG_SELECT;
@@ -1184,7 +1184,7 @@ void TilesFramework::clear_text_tags(text_tag_type type)
     m_region_tile->clear_text_tags(type);
 }
 
-void TilesFramework::add_text_tag(text_tag_type type, const std::string &tag, 
+void TilesFramework::add_text_tag(text_tag_type type, const std::string &tag,
                                   const coord_def &gc)
 {
     m_region_tile->add_text_tag(type, tag, gc);
diff --git a/crawl-ref/source/tilesdl.h b/crawl-ref/source/tilesdl.h
index 13440bb605..11016e3b2a 100644
--- a/crawl-ref/source/tilesdl.h
+++ b/crawl-ref/source/tilesdl.h
@@ -40,7 +40,7 @@ enum key_mod
 
 struct MouseEvent
 {
-    enum mouse_event_type 
+    enum mouse_event_type
     {
         PRESS,
         RELEASE,
@@ -57,7 +57,7 @@ struct MouseEvent
         SCROLL_DOWN = 0x10
     };
 
-    // kind of event 
+    // kind of event
     mouse_event_type event;
     // if PRESS or RELEASE, the button pressed
     mouse_event_button button;
@@ -190,7 +190,7 @@ extern TilesFramework tiles;
 
 #ifdef __MINGW32__
 #ifndef alloca
-// Srsly, MinGW, wtf?  
+// Srsly, MinGW, wtf?
 void *alloca(size_t);
 #endif
 #endif
diff --git a/crawl-ref/source/tiletex.cc b/crawl-ref/source/tiletex.cc
index c1a7ce63c4..6338ec9154 100644
--- a/crawl-ref/source/tiletex.cc
+++ b/crawl-ref/source/tiletex.cc
@@ -172,7 +172,7 @@ bool GenericTexture::load_texture(const char *filename,
     }
     else
     {
-        printf("Warning: unsupported format, bpp = %d for '%s'\n", 
+        printf("Warning: unsupported format, bpp = %d for '%s'\n",
                bpp, acBuffer);
         return false;
     }
diff --git a/crawl-ref/source/tiletex.h b/crawl-ref/source/tiletex.h
index 0003395bc8..d5692f9021 100644
--- a/crawl-ref/source/tiletex.h
+++ b/crawl-ref/source/tiletex.h
@@ -18,7 +18,7 @@ enum TextureID
     TEX_MAX
 };
 
-class GenericTexture 
+class GenericTexture
 {
 public:
     GenericTexture();
@@ -32,10 +32,10 @@ public:
     };
 
     // Arbitrary post-load texture processing
-    typedef bool(*tex_proc_func)(unsigned char *pixels, unsigned int w, 
+    typedef bool(*tex_proc_func)(unsigned char *pixels, unsigned int w,
         unsigned int h);
 
-    bool load_texture(const char *filename, MipMapOptions mip_opt, 
+    bool load_texture(const char *filename, MipMapOptions mip_opt,
                       tex_proc_func proc = NULL);
     bool load_texture(unsigned char *pixels, unsigned int w, unsigned int h,
                       MipMapOptions mip_opt);
@@ -90,7 +90,7 @@ inline void TilesTexture::get_coords(int idx, int ofs_x, int ofs_y,
     // center tiles on x, but allow taller tiles to extend upwards
     int size_ox = centre ? TILE_X / 2 - inf.width / 2 : 0;
     int size_oy = centre ? TILE_Y - inf.height : 0;
-    
+
     int ey = inf.ey;
     if (ymax > 0)
         ey = std::min(inf.sy + ymax - inf.offset_y, ey);
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index 0d4e9e5988..dad9622ccb 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -3609,7 +3609,7 @@ bool magic_mapping(int map_radius, int proportion, bool suppress_msg,
     {
         if (proportion < 100 && random2(100) >= proportion)
             continue;       // note that proportion can be over 100
-        
+
         const int dist = grid_distance( you.pos(), *ri );
 
         if (dist > pfar && one_chance_in(3))
@@ -3630,7 +3630,7 @@ bool magic_mapping(int map_radius, int proportion, bool suppress_msg,
                                                           grd(*ri));
         }
 #endif
-        
+
         if (!wizard_map && is_terrain_known(*ri))
             continue;