X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=quakedef.h;h=8c806df7d63b6bc0e7bf0472fa7d14e12b2c9121;hb=1351521ed9f6cd4ab9dc410a0d879a3f53b7d498;hp=899886de0ef01cf5f590c0b797c43ed3b79a3697;hpb=9ba80c169d244d56e90f437c512f827953cc1208;p=xonotic%2Fdarkplaces.git

diff --git a/quakedef.h b/quakedef.h
index 899886de..8c806df7 100644
--- 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,9 +19,11 @@ 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
+#define VERSION 1.50
+
+extern int buildnumber;
 
 #ifndef FALSE
 #define FALSE 0
@@ -46,8 +48,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define UNUSED(x)	(x = x)	// for pesky compiler / lint warnings
 
-#define	MINIMUM_MEMORY			0x550000
-#define	MINIMUM_MEMORY_LEVELPAK	(MINIMUM_MEMORY + 0x100000)
+// 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)
 
 #define MAX_NUM_ARGVS	50
 
@@ -61,8 +65,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #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
 
@@ -76,8 +80,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // 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
 
@@ -177,46 +182,29 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #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"
@@ -228,6 +216,10 @@ typedef struct
 
 #include "glquake.h"
 
+#include "ui.h"
+
+#include "portals.h"
+
 //=============================================================================
 
 // the host system specifies the base of the directory tree, the
@@ -237,7 +229,9 @@ typedef struct
 typedef struct
 {
 	char	*basedir;
+#if CACHEENABLE
 	char	*cachedir;		// for development over ISDN lines
+#endif
 	int		argc;
 	char	**argv;
 	void	*membase;
@@ -263,16 +257,15 @@ 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, ...);