diff --git a/docs/rh-log.txt b/docs/rh-log.txt index f1bf6066d..d1b7578b4 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,3 +1,8 @@ +February 10, 2009 +- Moved the V_InitFontColors() call earlier in the startup sequence so that + colored error messages appear colored in the startup window. Also lightened + up the "Flat" red to contrast better on the startup background. + February 9, 2009 - Changed I_InitInput() to acquire the IDirectInput8A interface by using DirectInput8Create() instead of CoCreateInstance(). This allows the Steam diff --git a/src/d_main.cpp b/src/d_main.cpp index 2fe678574..4627da8e3 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -2340,6 +2340,8 @@ void D_DoomMain (void) // [RH] Initialize localizable strings. GStrings.LoadStrings (false); + V_InitFontColors (); + // [RH] Moved these up here so that we can do most of our // startup output in a fullscreen console. diff --git a/src/g_mapinfo.cpp b/src/g_mapinfo.cpp index 8a480d984..860d6ac5e 100644 --- a/src/g_mapinfo.cpp +++ b/src/g_mapinfo.cpp @@ -408,7 +408,7 @@ void FMapInfoParser::ParseOpenBrace() switch(format_type) { default: - format_type = sc.CheckString("{")? FMT_New : FMT_Old; + format_type = sc.CheckString("{") ? FMT_New : FMT_Old; if (format_type == FMT_New) sc.SetCMode(true); break; diff --git a/src/v_font.cpp b/src/v_font.cpp index 157b7b1e8..b38080b02 100644 --- a/src/v_font.cpp +++ b/src/v_font.cpp @@ -2104,7 +2104,6 @@ EColorRange V_ParseFontColor (const BYTE *&color_value, int normalcolor, int bol void V_InitFonts() { - V_InitFontColors (); V_InitCustomFonts (); // load the heads-up font diff --git a/src/v_font.h b/src/v_font.h index e4b917f97..123b70ff1 100644 --- a/src/v_font.h +++ b/src/v_font.h @@ -134,5 +134,6 @@ EColorRange V_FindFontColor (FName name); PalEntry V_LogColorFromColorRange (EColorRange range); EColorRange V_ParseFontColor (const BYTE *&color_value, int normalcolor, int boldcolor); FFont *V_GetFont(const char *); +void V_InitFontColors(); #endif //__V_FONT_H__ diff --git a/src/win32/i_main.cpp b/src/win32/i_main.cpp index c6daae849..2203ed2ba 100644 --- a/src/win32/i_main.cpp +++ b/src/win32/i_main.cpp @@ -743,7 +743,7 @@ void ShowErrorPane(const char *text) SendMessage (ConWindow, EM_EXGETSEL, 0, (LPARAM)&end); ErrorIconChar = end.cpMax; - // Now start adding the actualy error message. + // Now start adding the actual error message. SendMessage (ConWindow, EM_REPLACESEL, FALSE, (LPARAM)"Execution could not continue.\n\n"); // Restore old charformat but with light yellow text. diff --git a/wadsrc/static/textcolors.txt b/wadsrc/static/textcolors.txt index 7b018525e..40cb1b8df 100644 --- a/wadsrc/static/textcolors.txt +++ b/wadsrc/static/textcolors.txt @@ -65,7 +65,7 @@ Console: #000000 #7F0000 0 127 #FF0000 #FFFEFE 128 256 Flat: - #DD0000 + #FF5566 } Blue