X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=quakedef.h;h=ec5c72b6efb29fbb305e5d0f0ed17bb542fd3a24;hb=4d33dcb245a32cf4c44807e8b53e4fccea944633;hp=bb5e7843939404ab667166c7bd00b150e7a02645;hpb=71a92bc0e061ee19fe5ed2c240b189dabbafd0d1;p=xonotic%2Fdarkplaces.git

diff --git a/quakedef.h b/quakedef.h
index bb5e7843..ec5c72b6 100644
--- a/quakedef.h
+++ b/quakedef.h
@@ -22,67 +22,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef QUAKEDEF_H
 #define QUAKEDEF_H
 
-#define QUAKE_GAME // as opposed to utilities
-
-#include <math.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <setjmp.h>
-
-#include "qtypes.h"
-
-extern char *buildstring;
+#include "darkplaces.h"
 
 #define GAMENAME "id1"
+#define STARTCONFIGFILENAME "quake.rc"
+#define CONFIGFILENAME "config.cfg"
 
-#define MAX_NUM_ARGVS	50
-
-
-#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
-
-#define MAX_PACKETFRAGMENT 1024		// max length of packet fragment
-#define NET_MAXMESSAGE	65536
-#define NET_MINRATE		500 // limits "rate" and "sv_maxrate" cvars
-#define NET_MAXRATE		25000 // limits "rate" and "sv_maxrate" cvars
-
-//
-// per-level limits
-//
-// LordHavoc: increased entity limit to 2048 from 600
-#define	MAX_EDICTS		32768		// FIXME: ouch! ouch! ouch!
-#define	MAX_LIGHTSTYLES	64
-// LordHavoc: increased model and sound limits from 256 and 256 to 4096 and 4096 (and added protocol extensions accordingly to break the 256 barrier)
-#define	MAX_MODELS		4096
-#define	MAX_SOUNDS		4096
-
-#define	SAVEGAME_COMMENT_LENGTH	39
-
-#define	MAX_STYLESTRING	64
-
-//
-// stats are integers communicated to the client by the server
-//
-#define	MAX_CL_STATS		32
-#define	STAT_HEALTH			0
-#define	STAT_FRAGS			1
-#define	STAT_WEAPON			2
-#define	STAT_AMMO			3
-#define	STAT_ARMOR			4
-#define	STAT_WEAPONFRAME	5
-#define	STAT_SHELLS			6
-#define	STAT_NAILS			7
-#define	STAT_ROCKETS		8
-#define	STAT_CELLS			9
-#define	STAT_ACTIVEWEAPON	10
-#define	STAT_TOTALSECRETS	11
-#define	STAT_TOTALMONSTERS	12
-#define	STAT_SECRETS		13		// bumped on client side by svc_foundsecret
-#define	STAT_MONSTERS		14		// bumped by svc_killedmonster
+// moveflags values
+#define MOVEFLAG_VALID 0x80000000
+#define MOVEFLAG_Q2AIRACCELERATE 0x00000001
+#define MOVEFLAG_NOGRAVITYONGROUND 0x00000002
+#define MOVEFLAG_GRAVITYUNAFFECTEDBYTICRATE 0x00000004
 
 // stock defines
 
@@ -172,33 +122,19 @@ extern char *buildstring;
 
 //===========================================
 
-// LordHavoc: increased player limit from 16 to 64
-#define	MAX_SCOREBOARD		64
-// LordHavoc: increased name limit from 32 to 64 characters
-#define	MAX_SCOREBOARDNAME	64
-
-#define	SOUND_CHANNELS		8
-
-#include "zone.h"
-#include "fs.h"
-#include "common.h"
-#include "cvar.h"
-#include "bspfile.h"
-#include "sys.h"
 #include "vid.h"
-#include "mathlib.h"
 
 #include "r_textures.h"
 
-#include "wad.h"
+#include "crypto.h"
 #include "draw.h"
 #include "screen.h"
 #include "netconn.h"
 #include "protocol.h"
-#include "cmd.h"
 #include "sbar.h"
 #include "sound.h"
 #include "model_shared.h"
+#include "world.h"
 #include "client.h"
 #include "render.h"
 #include "progs.h"
@@ -206,55 +142,24 @@ extern char *buildstring;
 #include "server.h"
 
 #include "input.h"
-#include "world.h"
 #include "keys.h"
-#include "console.h"
+#ifdef CONFIG_MENU
 #include "menu.h"
-#include "crc.h"
-#include "cdaudio.h"
-
+#endif
+#include "csprogs.h"
 #include "glquake.h"
+#include "palette.h"
 
-#include "ui.h"
-
-extern qboolean noclip_anglehack;
-
-//
-// host
-//
-extern cvar_t sys_ticrate;
-extern cvar_t developer;
-
-// true if into command execution
-extern qboolean host_initialized;
-extern double host_frametime;
-// LordHavoc: the real frametime, before slowmo and clamping are applied (used for console scrolling)
-extern double host_realframetime;
-// incremented every frame, never reset
-extern int host_framecount;
-// not bounded in any way, changed at start of every frame, never reset
-extern double realtime;
-
-void Host_ClearMemory(void);
-void Host_InitCommands(void);
-void Host_Init(void);
-void Host_Shutdown(void);
-void Host_Error(const char *error, ...);
-void Host_Frame(float time);
-void Host_Quit_f(void);
-void Host_ClientCommands(const char *fmt, ...);
-void Host_ShutdownServer(qboolean crash);
-void Host_Reconnect_f(void);
+extern qbool noclip_anglehack;
 
-// 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)
+/// 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 int current_skill;
 
-extern int minimum_memory;
-
 //
 // chase
 //
 extern cvar_t chase_active;
+extern cvar_t cl_viewmodel_scale;
 
 void Chase_Init (void);
 void Chase_Reset (void);
@@ -262,10 +167,14 @@ void Chase_Update (void);
 
 void fractalnoise(unsigned char *noise, int size, int startgrid);
 void fractalnoisequick(unsigned char *noise, int size, int startgrid);
-
-#include "palette.h"
+float noise4f(float x, float y, float z, float w);
 
 void Sys_Shared_Init(void);
 
+// Flag in size field of demos to indicate a client->server packet. Demo
+// playback will ignore this, but it may be useful to make DP sniff packets to
+// debug protocol exploits.
+#define DEMOMSG_CLIENT_TO_SERVER 0x80000000
+
 #endif