//Cvar_RegisterVariable(&joy_sensitivityroll);
#ifdef SDL_R_RESTART
- R_RegisterModule("SDL", sdl_start, sdl_shutdown, sdl_newmap);
+ R_RegisterModule("SDL", sdl_start, sdl_shutdown, sdl_newmap, NULL, NULL);
#endif
if (SDL_Init(SDL_INIT_VIDEO) < 0)
int thenone = -1;
static SDL_Color palette[256];
unsigned short palenc[256]; // store color id by char
-
- char **idata = ENGINE_ICON;
- char *data = idata[0];
+ char *xpm;
+ char **idata, *data;
+
+ xpm = (char *) FS_LoadFile("darkplaces-icon.xpm", tempmempool, false, NULL);
+ idata = NULL;
+ if(xpm)
+ idata = XPM_DecodeString(xpm);
+ if(!idata)
+ idata = ENGINE_ICON;
+ if(xpm)
+ Mem_Free(xpm);
+
+ data = idata[0];
if(sscanf(data, "%i %i %i %i", &width, &height, &colors, &isize) != 4)
{