rewrote memory system entirely (hunk, cache, and zone are gone, memory pools replaced...

[xonotic/darkplaces.git] / quakedef.h

diff --git a/quakedef.h b/quakedef.h
index e49cc2048c04c7ec6dc0e7408023a953f1fe6d0c..bba4b2383b6a49bc918cf2c33c010159748468a1 100644 (file)
--- a/quakedef.h
+++ b/quakedef.h
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -19,11 +19,24 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // quakedef.h -- primary header for client
 
-#define        QUAKE_GAME                      // as opposed to utilities
+#define QUAKE_GAME // as opposed to utilities
 
-#define        VERSION                         1.50
 extern int buildnumber;
 
+#if !defined BYTE_DEFINED
+typedef unsigned char          byte;
+#define BYTE_DEFINED 1
+#endif
+
+#undef true
+#undef false
+
+typedef enum {false, true} qboolean;
+
+#ifndef NULL
+#define NULL ((void *)0)
+#endif
+
 #ifndef FALSE
 #define FALSE 0
 #define TRUE 1
@@ -36,7 +49,7 @@ extern int buildnumber;
 #define ASSERT(condition)
 #endif
 
-#define        GAMENAME        "id1"
+#define GAMENAME "id1"
 
 #include <math.h>
 #include <string.h>
@@ -45,13 +58,6 @@ extern int buildnumber;
 #include <stdlib.h>
 #include <setjmp.h>
 
-#define UNUSED(x)      (x = x) // for pesky compiler / lint warnings
-
-// LordHavoc: default heap size (unless -heapsize (win32 only) or -mem is used), in megabytes
-#define DEFAULTMEM 24
-//#define      MINIMUM_MEMORY                  0x550000
-//#define      MINIMUM_MEMORY_LEVELPAK (MINIMUM_MEMORY + 0x100000)
-
 #define MAX_NUM_ARGVS  50
 
 // up / down
@@ -64,8 +70,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 +85,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
 
@@ -179,47 +186,31 @@ extern int buildnumber;
 
 #define        SOUND_CHANNELS          8
 
+#include "zone.h"
+#include "quakeio.h"
 #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 "render.h"
+#include "model_shared.h"
 #include "client.h"
+#include "render.h"
 #include "progs.h"
 #include "server.h"
 
-#include "model_shared.h"
-
 #include "input.h"
 #include "world.h"
 #include "keys.h"
@@ -231,6 +222,10 @@ typedef struct
 
 #include "glquake.h"
 
+#include "ui.h"
+
+#include "portals.h"
+
 //=============================================================================
 
 // the host system specifies the base of the directory tree, the
@@ -240,11 +235,11 @@ typedef struct
 typedef struct
 {
        char    *basedir;
+#if CACHEENABLE
        char    *cachedir;              // for development over ISDN lines
+#endif
        int             argc;
        char    **argv;
-       void    *membase;
-       int             memsize;
 } quakeparms_t;
 
 
@@ -261,21 +256,19 @@ extern qboolean noclip_anglehack;
 extern quakeparms_t host_parms;
 
 extern cvar_t          sys_ticrate;
-extern cvar_t          sys_nostdout;
 extern cvar_t          developer;
 
 extern qboolean        host_initialized;               // true if into command execution
 extern double          host_frametime;
+extern double          host_realframetime;     // LordHavoc: the real frametime, before slowmo and clamping are applied (used for console scrolling)
 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, ...);
@@ -290,8 +283,6 @@ extern int                  current_skill;          // skill level for currently loaded level (in case
                                                                                //  the user changes the cvar while the level is
                                                                                //  running, this reflects the level actually in use)
 
-extern qboolean                isDedicated;
-
 extern int                     minimum_memory;
 
 //
@@ -307,3 +298,5 @@ void fractalnoise(unsigned char *noise, int size, int startgrid);
 
 #include "palette.h"
 #include "image.h"
+
+void Sys_Shared_Init(void);