Add miscellaneous minor fixes.

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

3 files changed, 20 insertions, 30 deletions

diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 6629a1480b..2bffbdb455 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -1496,13 +1496,12 @@ enum killer_type                       // monster_die(), thing_thrown
     KILL_DISMISSED                     // only on new game startup
 };
 
-// This should be in order from the worst flight status to the best.
-// See mons_flies().
 enum flight_type
 {
     FL_NONE = 0,
-    FL_LEVITATE,
-    FL_FLY
+    FL_LEVITATE,                       // doesn't require physical effort
+    FL_FLY                             // wings, etc... paralysis == fall
+
 };
 
 enum level_area_type                   // you.level_type
@@ -2071,13 +2070,6 @@ enum mon_attitude_type
     ATT_FRIENDLY                       // created friendly (or tamed?)
 };
 
-enum mon_flight_type
-{
-    FLY_NOT,
-    FLY_POWERED,                        // wings, etc... paralysis == fall
-    FLY_LEVITATION                      // doesn't require physical effort
-};
-
 // These are now saved in an unsigned long in the monsters struct.
 enum monster_flag_type
 {
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index 152086313c..bbcf16d52a 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -131,42 +131,40 @@ static species_type old_species_order[] = {
     SP_MERFOLK,       SP_VAMPIRE
 };
 
-// Fantasy staples and humanoid creatures come first, then dimunitive and
+// Fantasy staples and humanoid creatures come first, then diminutive and
 // stealthy creatures, then monstrous creatures, then planetouched and after
 // all living creatures finally the undead. (MM)
 static species_type new_species_order[] = {
     // comparatively human-like looks
-    SP_HUMAN,       SP_HIGH_ELF,
-    SP_GREY_ELF,    SP_DEEP_ELF,
-    SP_SLUDGE_ELF,  SP_MOUNTAIN_DWARF,
-    SP_HILL_ORC,    SP_MERFOLK,
+    SP_HUMAN,         SP_HIGH_ELF,
+    SP_GREY_ELF,      SP_DEEP_ELF,
+    SP_SLUDGE_ELF,    SP_MOUNTAIN_DWARF,
+    SP_HILL_ORC,      SP_MERFOLK,
     // small species
-    SP_HALFLING,    SP_GNOME,
-    SP_KOBOLD,      SP_SPRIGGAN,
-    // significantly different body type than human
-    SP_NAGA,        SP_CENTAUR,
-    SP_OGRE,        SP_TROLL,
-    SP_MINOTAUR,    SP_KENKU,
+    SP_HALFLING,      SP_GNOME,
+    SP_KOBOLD,        SP_SPRIGGAN,
+    // significantly different body type from human
+    SP_NAGA,          SP_CENTAUR,
+    SP_OGRE,          SP_TROLL,
+    SP_MINOTAUR,      SP_KENKU,
     SP_RED_DRACONIAN,
     // celestial species
-    SP_DEMIGOD,     SP_DEMONSPAWN,
+    SP_DEMIGOD,       SP_DEMONSPAWN,
     // undead species
-    SP_MUMMY,       SP_GHOUL,
+    SP_MUMMY,         SP_GHOUL,
     SP_VAMPIRE
 };
 
 static species_type _random_draconian_species()
 {
-    const int num_drac = SP_PALE_DRACONIAN - SP_RED_DRACONIAN + 1;
+    const int num_drac = SP_BASE_DRACONIAN - SP_RED_DRACONIAN;
     return static_cast<species_type>(SP_RED_DRACONIAN + random2(num_drac));
 }
 
 static species_type _get_species(const int index)
 {
     if (index < 0 || (unsigned int) index >= ARRAYSZ(old_species_order))
-    {
         return (SP_UNKNOWN);
-    }
 
     return (Options.use_old_selection_order ? old_species_order[index]
                                             : new_species_order[index]);
@@ -220,7 +218,7 @@ static job_type new_jobs_order[] = {
 static job_type _get_class(const int index)
 {
     if (index < 0 || (unsigned int) index >= ARRAYSZ(old_jobs_order))
-       return JOB_UNKNOWN;
+       return (JOB_UNKNOWN);
 
     return (Options.use_old_selection_order? old_jobs_order[index]
                                            : new_jobs_order[index]);
@@ -247,7 +245,7 @@ int get_species_index_by_abbrev( const char *abbrev )
         if (tolower( abbrev[0] ) == tolower( Species_Abbrev_List[sp][0] )
             && tolower( abbrev[1] ) == tolower( Species_Abbrev_List[sp][1] ))
         {
-            return i;
+            return (i);
         }
     }
 
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 786cb8f58d..eb421383c3 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -4084,7 +4084,7 @@ void display_char_status()
     if (you.duration[DUR_PETRIFIED])
         mpr("You are petrified.");
     if (you.duration[DUR_SLEEP])
-        mpr("You are asleep." );
+        mpr("You are asleep.");
 
     if (you.duration[DUR_EXHAUSTED])
         mpr("You are exhausted.");