- Merged r1236, r1237, and r1240 of GZDoom.

SVN r3279 (trunk)
This commit is contained in:
Braden Obrzut 2011-08-14 23:53:20 +00:00
commit 5c81cf20ba
4 changed files with 17 additions and 3 deletions

View file

@ -529,8 +529,9 @@ void R_Init ()
StartScreen->Progress();
V_InitFonts();
StartScreen->Progress();
R_InitColormaps ();
StartScreen->Progress();
// Colormap init moved back to InitPalette()
//R_InitColormaps ();
//StartScreen->Progress();
R_InitPointToAngle ();
R_InitTables ();