Kill hard tabs in .h files and crawl_options.txt.

Turn off mp_warning by default.

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

13 files changed, 66 insertions, 70 deletions

diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 9e49de664e..1655e98edc 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -1731,7 +1731,7 @@ enum msg_channel_type
     MSGCH_PLAIN,          // regular text
     MSGCH_PROMPT,         // various prompts
     MSGCH_GOD,            // god/religion (param is god)
-    MSGCH_PRAY,		  // praying messages (param is god)
+    MSGCH_PRAY,           // praying messages (param is god)
     MSGCH_DURATION,       // effect down/warnings
     MSGCH_DANGER,         // serious life threats (ie very large HP attacks)
     MSGCH_WARN,           // much less serious threats
@@ -1750,8 +1750,8 @@ enum msg_channel_type
     MSGCH_FLOOR_ITEMS,    // like equipment, but lists of floor items
     MSGCH_MULTITURN_ACTION,  // delayed action messages
     MSGCH_DIAGNOSTICS,    // various diagnostic messages 
-    MSGCH_TUTORIAL,		  // messages for tutorial
-	MSGCH_DANGER_MAGIC,   // low magic warning
+    MSGCH_TUTORIAL,       // messages for tutorial
+    MSGCH_DANGER_MAGIC,   // low magic warning
     NUM_MESSAGE_CHANNELS  // always last
 };
 
diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h
index 1a96da890f..f3c2f261b0 100644
--- a/crawl-ref/source/externs.h
+++ b/crawl-ref/source/externs.h
@@ -1115,7 +1115,7 @@ public:
     bool        autopickup_no_burden; // don't autopickup if it changes burden
     bool        note_skill_max; // take note when skills reach new max
     bool        note_all_spells; // take note when learning any spell
-    bool        use_notes;	// take (and dump) notes
+    bool        use_notes;      // take (and dump) notes
     int         note_hp_percent; // percentage hp for notetaking
     int         ood_interesting; // how many levels OOD is noteworthy?
     int         easy_confirm;   // make yesno() confirming easier
@@ -1124,7 +1124,7 @@ public:
     int         background;     // select default background colour
     int         channels[NUM_MESSAGE_CHANNELS];  // msg channel colouring
     int         weapon;         // auto-choose weapon for character
-    int         book;		// auto-choose book for character
+    int         book;           // auto-choose book for character
     int         chaos_knight;   // choice of god for Chaos Knights (Xom/Makleb)
     int         death_knight;   // choice of god/necromancy for Death Knights
     int         priest;         // choice of god for priests (Zin/Yred)
@@ -1164,7 +1164,7 @@ public:
     std::vector<std::pair<int, int> > hp_colour;
     std::vector<std::pair<int, int> > mp_colour;
 
-    std::string map_file_name;	// name of mapping file to use
+    std::string map_file_name;  // name of mapping file to use
     std::vector<text_pattern> never_pickup;   // Objects we'll never pick up
     std::vector<text_pattern> always_pickup;  // Stuff we always pick up
     std::vector<text_pattern> note_monsters;  // Interesting monsters
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 790bfbfcd5..f73c7bd1d5 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -592,7 +592,7 @@ void game_options::reset_options()
     easy_confirm           = CONFIRM_SAFE_EASY;
     easy_quit_item_prompts = true;
     hp_warning             = 10;
-    magic_point_warning    = 10;
+    magic_point_warning    = 0;
     confirm_self_target    = true;
     default_target         = false;
     safe_autopickup        = true;
diff --git a/crawl-ref/source/item_use.h b/crawl-ref/source/item_use.h
index f85fe548ce..d177433c72 100644
--- a/crawl-ref/source/item_use.h
+++ b/crawl-ref/source/item_use.h
@@ -26,7 +26,7 @@
  * called from: acr - item_use
  * *********************************************************************** */
 bool armour_prompt(const std::string & mesg, int *index,
-		   operation_types oper);
+                   operation_types oper);
 
 
 // last updated 12may2000 {dlb}
diff --git a/crawl-ref/source/libutil.h b/crawl-ref/source/libutil.h
index f9cec51893..a84ab5a166 100644
--- a/crawl-ref/source/libutil.h
+++ b/crawl-ref/source/libutil.h
@@ -263,8 +263,8 @@ public:
     }
 
     text_pattern(const text_pattern &tp)
-        : 	base_pattern(tp),
-	pattern(tp.pattern),
+        : base_pattern(tp),
+          pattern(tp.pattern),
           compiled_pattern(NULL),
           isvalid(tp.isvalid),
           ignore_case(tp.ignore_case)
diff --git a/crawl-ref/source/libw32c.h b/crawl-ref/source/libw32c.h
index 730c1ea0b8..bb29497292 100644
--- a/crawl-ref/source/libw32c.h
+++ b/crawl-ref/source/libw32c.h
@@ -8,11 +8,6 @@
 #define WIN_NUMBER_OF_LINES     25
 
 #include <string>
-// I think the following definition is all we need from STD namespace..
-#ifdef __IBMCPP__			// Borland 5.01 doesn't seem to need this
-typedef std::basic_string<char> string;
-#endif
-
 #include <stdarg.h>
 
 void init_libw32c(void);
diff --git a/crawl-ref/source/menu.h b/crawl-ref/source/menu.h
index e76d86ae9f..9d58fa4158 100644
--- a/crawl-ref/source/menu.h
+++ b/crawl-ref/source/menu.h
@@ -72,7 +72,7 @@ struct MenuEntry
     virtual ~MenuEntry() { }
 
     bool operator<( const MenuEntry& rhs ) const {
-	return text < rhs.text;
+        return text < rhs.text;
     }
 
     void add_hotkey( int key )
diff --git a/crawl-ref/source/monplace.h b/crawl-ref/source/monplace.h
index 38c8014ba0..5b89d73871 100644
--- a/crawl-ref/source/monplace.h
+++ b/crawl-ref/source/monplace.h
@@ -89,7 +89,7 @@ monster_type rand_dragon( dragon_class_type type );
  * called from: monplace monstuff
  * *********************************************************************** */
 void mark_interesting_monst(struct monsters* monster,
-							char behaviour = BEH_SLEEP);
+                            char behaviour = BEH_SLEEP);
 
 bool grid_compatible(int grid_wanted, int actual_grid, bool generation = false);
 bool monster_habitable_grid(int monster_class, int actual_grid, 
diff --git a/crawl-ref/source/notes.h b/crawl-ref/source/notes.h
index 0948334b06..97518a277c 100644
--- a/crawl-ref/source/notes.h
+++ b/crawl-ref/source/notes.h
@@ -17,27 +17,27 @@
 
 enum NOTE_TYPES
 {
-    NOTE_HP_CHANGE = 0,		/* needs: new hp, max hp */
-    NOTE_MAXHP_CHANGE,		/* needs: new maxhp */
-    NOTE_MP_CHANGE,		/* needs: new mp, max mp */
-    NOTE_MAXMP_CHANGE,		/* needs: new maxmp */
-    NOTE_XP_LEVEL_CHANGE,	/* needs: new xplevel */
-    NOTE_DUNGEON_LEVEL_CHANGE,	/* needs: branch, subdepth */
-    NOTE_LEARN_SPELL,		/* needs: spell idx */
-    NOTE_GET_GOD,		/* needs: god id */
-    NOTE_GOD_GIFT,		/* needs: god id */
-    NOTE_GOD_POWER,		/* needs: god id, idx */
-    NOTE_GET_MUTATION,		/* needs: mutation idx */
-    NOTE_LOSE_MUTATION,		/* needs: mutation idx */
-    NOTE_ID_ITEM,		/* needs: item name (string) */
-    NOTE_GET_ITEM,		/* needs: item name (string) NOT HOOKED */
-    NOTE_GAIN_SKILL,		/* needs: skill id, level */
-    NOTE_SEEN_MONSTER,		/* needs: monster name (string) */
-    NOTE_KILL_MONSTER,		/* needs: monster name (string) */
-    NOTE_POLY_MONSTER,		/* needs: monster name (string) */
-    NOTE_USER_NOTE,		/* needs: description string */
+    NOTE_HP_CHANGE = 0,         /* needs: new hp, max hp */
+    NOTE_MAXHP_CHANGE,          /* needs: new maxhp */
+    NOTE_MP_CHANGE,             /* needs: new mp, max mp */
+    NOTE_MAXMP_CHANGE,          /* needs: new maxmp */
+    NOTE_XP_LEVEL_CHANGE,       /* needs: new xplevel */
+    NOTE_DUNGEON_LEVEL_CHANGE,  /* needs: branch, subdepth */
+    NOTE_LEARN_SPELL,           /* needs: spell idx */
+    NOTE_GET_GOD,               /* needs: god id */
+    NOTE_GOD_GIFT,              /* needs: god id */
+    NOTE_GOD_POWER,             /* needs: god id, idx */
+    NOTE_GET_MUTATION,          /* needs: mutation idx */
+    NOTE_LOSE_MUTATION,         /* needs: mutation idx */
+    NOTE_ID_ITEM,               /* needs: item name (string) */
+    NOTE_GET_ITEM,              /* needs: item name (string) NOT HOOKED */
+    NOTE_GAIN_SKILL,            /* needs: skill id, level */
+    NOTE_SEEN_MONSTER,          /* needs: monster name (string) */
+    NOTE_KILL_MONSTER,          /* needs: monster name (string) */
+    NOTE_POLY_MONSTER,          /* needs: monster name (string) */
+    NOTE_USER_NOTE,             /* needs: description string */
     NOTE_MESSAGE,               /* needs: message string */
-    NOTE_LOSE_GOD,		/* needs: god id */
+    NOTE_LOSE_GOD,              /* needs: god id */
     NOTE_MOLLIFY_GOD,           /* needs: god id */
     NOTE_NUM_TYPES
 };
@@ -46,7 +46,7 @@ struct Note
 {
     Note();
     Note( NOTE_TYPES t, int f = 0, int s = 0, const char* n = 0,
-		  const char* d = 0);
+          const char* d = 0);
     NOTE_TYPES type;
     int first, second;
     long turn;
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 0bca2f9314..983b8403f1 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -3791,10 +3791,11 @@ void dec_mp(int mp_loss)
         you.magic_points = 0;
 
     if (Options.magic_point_warning
-            && you.magic_points <= (you.max_magic_points * Options.magic_point_warning) / 100)
-        {
-            mpr( "* * * LOW MAGIC WARNING * * *", MSGCH_DANGER_MAGIC );
-        }
+        && you.magic_points < (you.max_magic_points 
+                               * Options.magic_point_warning) / 100)
+    {
+        mpr( "* * * LOW MAGIC WARNING * * *", MSGCH_DANGER_MAGIC );
+    }
 
     take_note(Note(NOTE_MP_CHANGE, you.magic_points, you.max_magic_points));
     you.redraw_magic_points = 1;
diff --git a/crawl-ref/source/stuff.h b/crawl-ref/source/stuff.h
index 401d6a746b..fb55be530e 100644
--- a/crawl-ref/source/stuff.h
+++ b/crawl-ref/source/stuff.h
@@ -67,7 +67,7 @@ bool yesno( const char * str, bool safe = true, int safeanswer = 0,
             bool noprompt = false );
 
 int yesnoquit( const char* str, bool safe = true,
-	       int safeanswer = 0, bool clear_after = true );
+               int safeanswer = 0, bool clear_after = true );
 
 
 bool in_bounds( int x, int y );
diff --git a/crawl-ref/source/tutorial.h b/crawl-ref/source/tutorial.h
index 7c2029f07c..86a1cedae3 100644
--- a/crawl-ref/source/tutorial.h
+++ b/crawl-ref/source/tutorial.h
@@ -3,7 +3,7 @@
  *  Summary:    Stuff needed for tutorial
  *  Written by: JPEG
  *
- *	Created on 2007-01-11.
+ *  Created on 2007-01-11.
  */
 
 #ifndef TUTORIAL_H
@@ -40,61 +40,61 @@ void learned_something_new(unsigned int seen_what, int x=0, int y=0);
 
 enum tutorial_event
 {
-    TUT_SEEN_FIRST_OBJECT,	// 0
+    TUT_SEEN_FIRST_OBJECT,  // 0
     /* seen certain items */
-    TUT_SEEN_POTION, 		
+    TUT_SEEN_POTION,        
     TUT_SEEN_SCROLL,
     TUT_SEEN_WAND,
     TUT_SEEN_SPBOOK,
-    TUT_SEEN_JEWELLERY,		// 5	
-    TUT_SEEN_MISC,		
+    TUT_SEEN_JEWELLERY,     // 5    
+    TUT_SEEN_MISC,      
     TUT_SEEN_WEAPON,
     TUT_SEEN_MISSILES,
     TUT_SEEN_ARMOUR,
-    TUT_SEEN_RANDART,		// 10
-    TUT_SEEN_FOOD,	
+    TUT_SEEN_RANDART,       // 10
+    TUT_SEEN_FOOD,  
     TUT_SEEN_CARRION,
-    TUT_SEEN_STAIRS,		
+    TUT_SEEN_STAIRS,        
     TUT_SEEN_TRAPS,
-    TUT_SEEN_ALTAR,			// 15
-    TUT_SEEN_SHOP,			// not tested so far
+    TUT_SEEN_ALTAR,         // 15
+    TUT_SEEN_SHOP,          // not tested so far
     TUT_SEEN_DOOR,
     /* other 'first events */
     TUT_SEEN_MONSTER,
-    TUT_KILLED_MONSTER,		
-    TUT_NEW_LEVEL,			// 20
+    TUT_KILLED_MONSTER,     
+    TUT_NEW_LEVEL,          // 20
     TUT_SKILL_RAISE,
     TUT_YOU_ENCHANTED,
-    TUT_YOU_SICK,	
-    TUT_YOU_POISON,		
-    TUT_YOU_CURSED,			// 25
-    TUT_YOU_HUNGRY,	
+    TUT_YOU_SICK,   
+    TUT_YOU_POISON,     
+    TUT_YOU_CURSED,         // 25
+    TUT_YOU_HUNGRY, 
     TUT_YOU_STARVING,
     TUT_MULTI_PICKUP,
-    TUT_HEAVY_LOAD,	
-    TUT_ROTTEN_FOOD, 		// 30
-    TUT_NEED_HEALING,		
+    TUT_HEAVY_LOAD, 
+    TUT_ROTTEN_FOOD,        // 30
+    TUT_NEED_HEALING,       
     TUT_NEED_POISON_HEALING,
-    TUT_RUN_AWAY,	
+    TUT_RUN_AWAY,   
     TUT_MAKE_CHUNKS,
-    TUT_POSTBERSERK,		// 35
+    TUT_POSTBERSERK,        // 35
     TUT_SHIFT_RUN,
-    TUT_MAP_VIEW,	
+    TUT_MAP_VIEW,   
 //    TUT_AUTOEXPLORE,
     TUT_DONE_EXPLORE,
-    TUT_YOU_MUTATED,		// 39
+    TUT_YOU_MUTATED,        // 39
     TUT_NEW_ABILITY,
     TUT_WIELD_WEAPON,
-    TUT_EVENTS_NUM 			// 42
+    TUT_EVENTS_NUM          // 42
 }; // for numbers higher than 45 change size of tutorial_events in externs.h
 
 enum tutorial_types
 {
-//    TUT_MELEE_CHAR,	// 0
+//    TUT_MELEE_CHAR,   // 0
     TUT_BERSERK_CHAR,
     TUT_MAGIC_CHAR,
     TUT_RANGER_CHAR,
-    TUT_TYPES_NUM	// 4
+    TUT_TYPES_NUM   // 4
 };    
 
 #endif
diff --git a/crawl-ref/source/view.h b/crawl-ref/source/view.h
index 9b9f0f34c3..276c6d1f39 100644
--- a/crawl-ref/source/view.h
+++ b/crawl-ref/source/view.h
@@ -52,7 +52,7 @@ void draw_border(void);
 void item(void);
 
 void find_features(const std::vector<coord_def>& features,
-	unsigned char feature, std::vector<coord_def> *found);
+        unsigned char feature, std::vector<coord_def> *found);
 
 // last updated 12may2000 {dlb}
 /* ***********************************************************************