Call VID_Init() before IN_Init().

Removed ifdef __linux__
This commit is contained in:
Marcus Sundberg 2000-01-09 02:14:48 +00:00
parent 89263d5eca
commit 9bc4ef12af

View file

@ -1480,35 +1480,19 @@ void Host_Init (quakeparms_t *parms)
host_colormap = (byte *)COM_LoadHunkFile ("gfx/colormap.lmp"); host_colormap = (byte *)COM_LoadHunkFile ("gfx/colormap.lmp");
if (!host_colormap) if (!host_colormap)
Sys_Error ("Couldn't load gfx/colormap.lmp"); Sys_Error ("Couldn't load gfx/colormap.lmp");
#ifdef __linux__
IN_Init (); VID_Init(host_basepal);
CDAudio_Init (); IN_Init();
VID_Init (host_basepal); Draw_Init();
Draw_Init (); SCR_Init();
SCR_Init (); R_Init();
R_Init ();
// S_Init (); // S_Init is now done as part of VID. Sigh. // S_Init (); // S_Init is now done as part of VID. Sigh.
cls.state = ca_disconnected; cls.state = ca_disconnected;
Sbar_Init (); CDAudio_Init();
CL_Init (); Sbar_Init();
#else CL_Init();
VID_Init (host_basepal);
Draw_Init ();
SCR_Init ();
R_Init ();
// S_Init (); // S_Init is now done as part of VID. Sigh.
#ifdef GLQUAKE
S_Init();
#endif
cls.state = ca_disconnected;
CDAudio_Init ();
Sbar_Init ();
CL_Init ();
IN_Init ();
#endif
Cbuf_InsertText ("exec quake.rc\n"); Cbuf_InsertText ("exec quake.rc\n");
Cbuf_AddText ("echo Type connect <internet address> or use GameSpy to connect to a game.\n"); Cbuf_AddText ("echo Type connect <internet address> or use GameSpy to connect to a game.\n");