- Fixed: The crosshair must be initialized after the texture manager because

on the fly texture creation for graphics patches is no longer supported.


SVN r1237 (trunk)

docs/rh-log.txt

@@ -1,3 +1,8 @@
+September 19, 2008  (Changes by Graf Zahl)
+- Fixed: The crosshair must be initialized after the texture manager because
+  on the fly texture creation for graphics patches is no longer supported.
+- Fixed a few Linux compile errors.
+
 September 16, 2008  (Changes by Graf Zahl)
 - Changed: Replaced weapons should not be given by generic cheats, only
   when explicitly giving them.

src/d_main.cpp

@@ -2484,6 +2484,9 @@ void D_DoomMain (void)
 	Printf ("Texman.Init: Init texture manager.\n");
 	TexMan.Init();
 
+	// Now that all textues have been loaded the crosshair can be initialized.
+	crosshair.Callback ();
+
 	// [RH] Parse through all loaded mapinfo lumps
 	Printf ("G_ParseMapInfo: Load map definitions.\n");
 	G_ParseMapInfo ();

src/g_shared/shared_sbar.cpp

@@ -94,7 +94,7 @@ CUSTOM_CVAR (Bool, st_scale, true, CVAR_ARCHIVE)
 	}
 }
 
-CUSTOM_CVAR (Int, crosshair, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
+CUSTOM_CVAR (Int, crosshair, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG|CVAR_NOINITCALL)
 {
 	int num = self;
 	char name[16], size;

src/sdl/sdlvideo.cpp

@@ -9,7 +9,7 @@
 #include "v_video.h"
 #include "v_pfx.h"
 #include "stats.h"
-
+#include "v_palette.h"
 #include "sdlvideo.h"
 
 #include <SDL.h>