X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=quakedef.h;h=12dbfc1f5c94661eb59e668978e33d3c824b889d;hb=8e579bbf57c9235bc3c11838e5a68bc52be3e9df;hp=a7c356203134a23a36b476100985aa296d11e90d;hpb=0631cd03cdfe0b948defbfc9d1f33ee4dc5d170c;p=xonotic%2Fdarkplaces.git

diff --git a/quakedef.h b/quakedef.h
index a7c35620..12dbfc1f 100644
--- a/quakedef.h
+++ b/quakedef.h
@@ -22,8 +22,8 @@ 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 <sys/types.h>
 #include <math.h>
 #include <string.h>
 #include <stdarg.h>
@@ -46,9 +46,9 @@ extern char *buildstring;
 #define	ON_EPSILON		0.1			// point on plane side epsilon
 
 #define MAX_PACKETFRAGMENT 1024		// max length of packet fragment
-// LordHavoc: this was 1024, now 65536
-#define	MAX_DATAGRAM	65536		// max length of unreliable
-#define	MAX_NETRELIABLE	65536		// max length of reliable message (fragments into unreliable packets)
+#define NET_MAXMESSAGE	65536
+#define NET_MINRATE		1000 // limits "rate" and "sv_maxrate" cvars
+#define NET_MAXRATE		25000 // limits "rate" and "sv_maxrate" cvars
 
 //
 // per-level limits
@@ -117,22 +117,23 @@ extern char *buildstring;
 //===========================================
 // AK nexuiz changed and added defines
 
-#define NEX_IT_UZI					1
-#define NEX_IT_SHOTGUN				2
-#define NEX_IT_ELECTRO				8
-#define NEX_IT_CRYLINK				16
-#define NEX_IT_NEX					32
-#define NEX_IT_HAGAR				64
-#define NEX_IT_ROCKET_LAUNCHER		128
-#define NEX_IT_SHELLS				256
-#define NEX_IT_BULLETS				512
-#define NEX_IT_ROCKETS				1024
-#define NEX_IT_CELLS				2048
-#define NEX_IT_LASER				4094
-#define NEX_IT_STRENGTH			8192
-#define NEX_IT_INVINCIBLE			16384
-#define NEX_IT_SPEED				32767
-#define NEX_IT_SLOWMO				65536
+#define NEX_IT_UZI              1
+#define NEX_IT_SHOTGUN          2
+#define NEX_IT_GRENADE_LAUNCHER 4
+#define NEX_IT_ELECTRO          8
+#define NEX_IT_CRYLINK          16
+#define NEX_IT_NEX              32
+#define NEX_IT_HAGAR            64
+#define NEX_IT_ROCKET_LAUNCHER  128
+#define NEX_IT_SHELLS           256
+#define NEX_IT_BULLETS          512
+#define NEX_IT_ROCKETS          1024
+#define NEX_IT_CELLS            2048
+#define NEX_IT_LASER            4094
+#define NEX_IT_STRENGTH         8192
+#define NEX_IT_INVINCIBLE       16384
+#define NEX_IT_SPEED            32768
+#define NEX_IT_SLOWMO           65536
 
 //===========================================
 //rogue changed and added defines
@@ -176,8 +177,6 @@ extern char *buildstring;
 // 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"
@@ -201,6 +200,7 @@ extern char *buildstring;
 #include "client.h"
 #include "render.h"
 #include "progs.h"
+#include "progsvm.h"
 #include "server.h"
 
 #include "input.h"
@@ -238,7 +238,6 @@ void Host_InitCommands(void);
 void Host_Init(void);
 void Host_Shutdown(void);
 void Host_Error(const char *error, ...);
-void Host_EndGame(const char *message, ...);
 void Host_Frame(float time);
 void Host_Quit_f(void);
 void Host_ClientCommands(const char *fmt, ...);