added function definitions for tab completion back (oops)

[xonotic/darkplaces.git] / quakedef.h

diff --git a/quakedef.h b/quakedef.h
index 3aee507574eff07f720c5d0faef432655bfc54c3..73ad3018c04bddf7d323ec2dd338300565ef73db 100644 (file)
--- a/quakedef.h
+++ b/quakedef.h
@@ -47,7 +47,7 @@ extern int buildnumber;
 
 #define UNUSED(x)      (x = x) // for pesky compiler / lint warnings
 
-// LordHavoc: default heap size (unless -heapsize (win32 only) or -mem is used), in megabytes
+// LordHavoc: default heap size (unless -heapsize, -mem, or -winmem is used), in megabytes
 #define DEFAULTMEM 24
 //#define      MINIMUM_MEMORY                  0x550000
 //#define      MINIMUM_MEMORY_LEVELPAK (MINIMUM_MEMORY + 0x100000)
@@ -64,8 +64,8 @@ extern int buildnumber;
 #define        ROLL    2
 
 
-#define        MAX_QPATH               64                      // max length of a quake game pathname
-#define        MAX_OSPATH              128                     // max length of a filesystem pathname
+#define        MAX_QPATH               128                     // max length of a quake game pathname
+#define        MAX_OSPATH              1024            // max length of a filesystem pathname
 
 #define        ON_EPSILON              0.1                     // point on plane side epsilon
 
@@ -79,8 +79,9 @@ extern int buildnumber;
 // LordHavoc: increased entity limit to 2048 from 600
 #define        MAX_EDICTS              2048            // FIXME: ouch! ouch! ouch!
 #define        MAX_LIGHTSTYLES 64
-#define        MAX_MODELS              256                     // these are sent over the net as bytes
-#define        MAX_SOUNDS              256                     // so they cannot be blindly increased
+// LordHavoc: increased model and sound limits from 256 and 256 to 1024 and 1024 (and added protocol extensions accordingly)
+#define        MAX_MODELS              1024                    // these are sent over the net as bytes
+#define        MAX_SOUNDS              1024                    // so they cannot be blindly increased
 
 #define        SAVEGAME_COMMENT_LENGTH 39
 
@@ -180,46 +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"
@@ -240,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;
@@ -271,12 +257,10 @@ extern    int                     host_framecount;        // incremented every frame, never reset
 extern double          realtime;                       // not bounded in any way, changed at
                                                                                // start of every frame, never reset
 
-extern double          sv_frametime;
-
 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, ...);