oops, forgot to fix the Qread and Qwrite calls

[xonotic/darkplaces.git] / quakedef.h

diff --git a/quakedef.h b/quakedef.h
index db706ec77183fa82cd02c7258d8103020460a1b3..73ad3018c04bddf7d323ec2dd338300565ef73db 100644 (file)
--- a/quakedef.h
+++ b/quakedef.h
@@ -181,48 +181,29 @@ extern int buildnumber;
 #define        SOUND_CHANNELS          8
 
 #include "common.h"
+#include "cvar.h"
 #include "bspfile.h"
 #include "vid.h"
 #include "sys.h"
 #include "zone.h"
 #include "mathlib.h"
 
-// LordHavoc: made this more compact, and added some more fields
-typedef struct
-{
-       vec3_t  origin;
-       vec3_t  angles;
-       int             effects;
-       short   modelindex;
-       short   frame;
-       byte    colormap;
-       byte    skin;
-       byte    alpha;
-       byte    scale;
-       byte    glowsize;
-       byte    glowcolor;
-       byte    colormod;
-} entity_state_t;
-
-
 #include "r_textures.h"
 
 #include "wad.h"
 #include "draw.h"
-#include "cvar.h"
 #include "screen.h"
 #include "net.h"
 #include "protocol.h"
 #include "cmd.h"
 #include "sbar.h"
 #include "sound.h"
+#include "model_shared.h"
 #include "render.h"
 #include "client.h"
 #include "progs.h"
 #include "server.h"
 
-#include "model_shared.h"
-
 #include "input.h"
 #include "world.h"
 #include "keys.h"
@@ -243,7 +224,9 @@ typedef struct
 typedef struct
 {
        char    *basedir;
+#if CACHEENABLE
        char    *cachedir;              // for development over ISDN lines
+#endif
        int             argc;
        char    **argv;
        void    *membase;
@@ -277,7 +260,7 @@ extern      double          realtime;                       // not bounded in any way, changed at
 void Host_ClearMemory (void);
 void Host_ServerFrame (void);
 void Host_InitCommands (void);
-void Host_Init ();
+void Host_Init (void);
 void Host_Shutdown(void);
 void Host_Error (char *error, ...);
 void Host_EndGame (char *message, ...);