Make the init process more dependency based.

Most subsystems that depend on other subsystems now call the init functions
themselves. This makes for much cleaner client initialization (more work
needs to be done for the server).
This commit is contained in:
Bill Currie 2012-02-01 21:52:47 +09:00
parent c4e08bc152
commit f800e79a38
10 changed files with 91 additions and 86 deletions

View file

@ -50,6 +50,7 @@ static __attribute__ ((used)) const char rcsid[] =
#include "QF/draw.h"
#include "QF/quakefs.h"
#include "QF/render.h"
#include "QF/screen.h"
#include "QF/skin.h"
#include "QF/sys.h"
#include "QF/vid.h"
@ -146,6 +147,7 @@ R_Init (void)
"Load a pointfile to determine map leaks");
Cmd_AddCommand ("loadsky", R_LoadSky_f, "Load a skybox");
SCR_Init ();
R_InitBubble ();
GDT_Init ();

View file

@ -256,6 +256,7 @@ R_RenderView (void)
VISIBLE void
R_Init (void)
{
SCR_Init ();
R_InitBsp ();
R_InitAlias ();
R_InitSprites ();

View file

@ -147,6 +147,7 @@ R_Init (void)
// get stack position so we can guess if we are going to overflow
r_stack_start = (byte *) & dummy;
SCR_Init ();
R_SetFPCW ();
#ifdef USE_INTEL_ASM
R_InitVars ();

View file

@ -174,6 +174,7 @@ R_Init (void)
// get stack position so we can guess if we are going to overflow
r_stack_start = (byte *) & dummy;
SCR_Init ();
R_InitTurb ();
Cmd_AddCommand ("timerefresh", R_TimeRefresh_f, "Tests the current "

View file

@ -31,8 +31,7 @@
# include "config.h"
#endif
static __attribute__ ((used)) const char rcsid[] =
"$Id$";
static __attribute__ ((used)) const char rcsid[] = "$Id$";
#ifdef HAVE_STRING_H
# include <string.h>
@ -50,6 +49,7 @@ static __attribute__ ((used)) const char rcsid[] =
#include <stdio.h>
#include <stdlib.h>
#include "QF/cbuf.h"
#include "QF/cvar.h"
#include "QF/in_event.h"
#include "QF/input.h"
@ -142,11 +142,11 @@ IN_Shutdown (void)
}
void
IN_Init (void)
IN_Init (cbuf_t *cbuf)
{
IE_Init ();
IN_LL_Init ();
Key_Init (cbuf);
JOY_Init ();
in_mouse_x = in_mouse_y = 0.0;
@ -156,6 +156,7 @@ void
IN_Init_Cvars (void)
{
IE_Init_Cvars ();
Key_Init_Cvars ();
JOY_Init_Cvars ();
in_grab = Cvar_Get ("in_grab", "0", CVAR_ARCHIVE, IN_UpdateGrab,
"With this set to 1, quake will grab the mouse, "