A bit more type-safety (slightly intrusive this time): you.species and

you.char_class.


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

1 files changed, 12 insertions, 2 deletions

diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index aeb0522ee9..aa5098b3ff 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -2570,6 +2570,9 @@ void level_change(void)
                     case SP_BASE_DRACONIAN:
                         mpr("");
                         break;
+
+                    default:
+                        break;
                     }
                     more();
                     redraw_screen();
@@ -2794,6 +2797,10 @@ void level_change(void)
                 if (!(you.experience_level % 5))
                     modify_stat(STAT_RANDOM, 1, false);
                 break;
+
+            case NUM_SPECIES:
+            case SP_UNKNOWN:
+                break;
             }
         }
 
@@ -3734,7 +3741,7 @@ int scan_randarts(char which_property, bool calc_unid)
     return (retval);
 }                               // end scan_randarts()
 
-void modify_stat(unsigned char which_stat, char amount, bool suppress_msg)
+void modify_stat(stat_type which_stat, char amount, bool suppress_msg)
 {
     char *ptr_stat = NULL;
     char *ptr_stat_max = NULL;
@@ -3752,7 +3759,7 @@ void modify_stat(unsigned char which_stat, char amount, bool suppress_msg)
     std::string msg = "You feel ";
 
     if (which_stat == STAT_RANDOM)
-        which_stat = random2(NUM_STATS);
+        which_stat = static_cast<stat_type>(random2(NUM_STATS));
 
     switch (which_stat)
     {
@@ -3776,6 +3783,9 @@ void modify_stat(unsigned char which_stat, char amount, bool suppress_msg)
         ptr_redraw = &you.redraw_intelligence;
         msg += ((amount > 0) ? "clever." : "stupid.");
         break;
+
+    default:
+        break;
     }
 
     if (!suppress_msg)