qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-05-30 00:10:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

First stage of video and input system merge. The city has collapsed, wreckage sifting ensues...

Browse source
This commit is contained in:
Ragnvald Maartmann-Moe IV 2001-04-15 04:18:22 +00:00
parent bd0fab4ce1
commit 66fafd3e0e
91 changed files with 20971 additions and 1214 deletions
Download patch file Download diff file Expand all files Collapse all files

20
qw/source/cl_main.c
View file

@ -93,7 +93,7 @@
#include "QF/sound.h"
#include "QF/sys.h"
#include "teamplay.h"
#include "vid.h"
#include "QF/vid.h"
#include "view.h"
#include "QF/va.h"
@ -189,8 +189,8 @@ int host_framecount;
int host_hunklevel;
byte *host_basepal;
byte *host_colormap;
byte *vid_basepal;
byte *vid_colormap;
cvar_t *host_speeds; // set for running times
cvar_t *show_fps; // set for running times
@ -1634,15 +1634,15 @@ Host_Init (void)
R_Textures_Init ();
host_basepal = (byte *) COM_LoadHunkFile ("gfx/palette.lmp");
if (!host_basepal)
vid_basepal = (byte *) COM_LoadHunkFile ("gfx/palette.lmp");
if (!vid_basepal)
Sys_Error ("Couldn't load gfx/palette.lmp");
host_colormap = (byte *) COM_LoadHunkFile ("gfx/colormap.lmp");
if (!host_colormap)
vid_colormap = (byte *) COM_LoadHunkFile ("gfx/colormap.lmp");
if (!vid_colormap)
Sys_Error ("Couldn't load gfx/colormap.lmp");
#ifdef __linux__
CDAudio_Init ();
VID_Init (host_basepal);
VID_Init (vid_basepal);
IN_Init ();
Draw_Init ();
SCR_Init ();
@ -1655,7 +1655,7 @@ Host_Init (void)
Skin_Init ();
CL_Init ();
#else
VID_Init (host_basepal);
VID_Init (vid_basepal);
Draw_Init ();
SCR_Init ();
R_Init ();
@ -1719,6 +1719,6 @@ Host_Shutdown (void)
NET_Shutdown ();
S_Shutdown ();
IN_Shutdown ();
if (host_basepal)
if (vid_basepal)
VID_Shutdown ();
}