Fixed char_set being ignored.

Fixed g++ warnings in libunix.cc.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.1.4@506 c06c8d41-db1a-0410-9941-cceddc491573

3 files changed, 2 insertions, 20 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index ef7bf4b03b..6be9c94139 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -2687,6 +2687,7 @@ static bool initialise(void)
     seed_rng();
     init_overmap();             // in overmap.cc (duh?)
     clear_ids();                // in itemname.cc
+    init_char_table(Options.char_set);
     init_feature_table();
 
     init_properties();
@@ -2803,6 +2804,7 @@ static bool initialise(void)
     you.your_name[kNameLen - 1] = 0;
 
     // In case Lua changed the character set.
+    init_char_table(Options.char_set);
     init_feature_table();
 #endif
     viewwindow(1, false);   // This just puts the view up for the first turn.
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 6a2a1f7dc5..6b3559c7a3 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -523,7 +523,6 @@ void game_options::reset_options()
 #else
     char_set               = CSET_IBM;
 #endif
-    init_char_table(char_set);
     
     // set it to the .crawlrc default
     autopickups = ((1L << 15) | // gold
@@ -1169,8 +1168,6 @@ void game_options::read_option_line(const std::string &str, bool runscript)
                 valid = false;
             }
         }
-        if (valid)
-            init_char_table(char_set);
     }
     else if (key == "default_autopickup")
     {
diff --git a/crawl-ref/source/libunix.cc b/crawl-ref/source/libunix.cc
index 99605bea5f..7b4884cb04 100644
--- a/crawl-ref/source/libunix.cc
+++ b/crawl-ref/source/libunix.cc
@@ -95,55 +95,38 @@ static short translate_colour( short col )
     {
     case BLACK:
         return COLOR_BLACK;
-        break;
     case BLUE:
         return COLOR_BLUE;
-        break;
     case GREEN:
         return COLOR_GREEN;
-        break;
     case CYAN:
         return COLOR_CYAN;
-        break;
     case RED:
         return COLOR_RED;
-        break;
     case MAGENTA:
         return COLOR_MAGENTA;
-        break;
     case BROWN:
         return COLOR_YELLOW;
-        break;
     case LIGHTGREY:
         return COLOR_WHITE;
-        break;
     case DARKGREY:
         return COLOR_BLACK + COLFLAG_CURSES_BRIGHTEN;
-        break;
     case LIGHTBLUE:
         return COLOR_BLUE + COLFLAG_CURSES_BRIGHTEN;
-        break;
     case LIGHTGREEN:
         return COLOR_GREEN + COLFLAG_CURSES_BRIGHTEN;
-        break;
     case LIGHTCYAN:
         return COLOR_CYAN + COLFLAG_CURSES_BRIGHTEN;
-        break;
     case LIGHTRED:
         return COLOR_RED + COLFLAG_CURSES_BRIGHTEN;
-        break;
     case LIGHTMAGENTA:
         return COLOR_MAGENTA + COLFLAG_CURSES_BRIGHTEN;
-        break;
     case YELLOW:
         return COLOR_YELLOW + COLFLAG_CURSES_BRIGHTEN;
-        break;
     case WHITE:
         return COLOR_WHITE + COLFLAG_CURSES_BRIGHTEN;
-        break;
     default:
         return COLOR_GREEN;
-        break;                  //mainly for debugging
     }
 }