inlined Host_EndGame in CL_ParseServerMessage's svc_disconnect case and greatly reduc...

[xonotic/darkplaces.git] / quakedef.h

diff --git a/quakedef.h b/quakedef.h
index 86529c7e23203c1565c16f87560a0d04d325dc83..bb5e7843939404ab667166c7bd00b150e7a02645 100644 (file)
--- a/quakedef.h
+++ b/quakedef.h
@@ -45,19 +45,20 @@ extern char *buildstring;
 
 #define        ON_EPSILON              0.1                     // point on plane side epsilon
 
-// LordHavoc: these were 8000 and 1024 respectively, now 64000 and 8000
-#define        MAX_MSGLEN              64000           // max length of a reliable message
-#define        MAX_DATAGRAM    8000            // max length of unreliable message
+#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              2048            // FIXME: ouch! ouch! ouch!
+#define        MAX_EDICTS              32768           // FIXME: ouch! ouch! ouch!
 #define        MAX_LIGHTSTYLES 64
-// 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
+// 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
 
@@ -113,6 +114,27 @@ extern char *buildstring;
 #define IT_SIGIL3               (1<<30)
 #define IT_SIGIL4               (1<<31)
 
+//===========================================
+// AK nexuiz changed and added defines
+
+#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
 
@@ -152,17 +174,18 @@ extern char *buildstring;
 
 // LordHavoc: increased player limit from 16 to 64
 #define        MAX_SCOREBOARD          64
-#define        MAX_SCOREBOARDNAME      32
+// LordHavoc: increased name limit from 32 to 64 characters
+#define        MAX_SCOREBOARDNAME      64
 
 #define        SOUND_CHANNELS          8
 
 #include "zone.h"
-#include "quakeio.h"
+#include "fs.h"
 #include "common.h"
 #include "cvar.h"
 #include "bspfile.h"
-#include "vid.h"
 #include "sys.h"
+#include "vid.h"
 #include "mathlib.h"
 
 #include "r_textures.h"
@@ -170,7 +193,7 @@ extern char *buildstring;
 #include "wad.h"
 #include "draw.h"
 #include "screen.h"
-#include "net.h"
+#include "netconn.h"
 #include "protocol.h"
 #include "cmd.h"
 #include "sbar.h"
@@ -179,6 +202,7 @@ extern char *buildstring;
 #include "client.h"
 #include "render.h"
 #include "progs.h"
+#include "progsvm.h"
 #include "server.h"
 
 #include "input.h"
@@ -193,8 +217,6 @@ extern char *buildstring;
 
 #include "ui.h"
 
-#include "portals.h"
-
 extern qboolean noclip_anglehack;
 
 //
@@ -213,17 +235,16 @@ 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_ServerFrame (void);
-void Host_InitCommands (void);
-void Host_Init (void);
+void Host_ClearMemory(void);
+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, ...);
-void Host_ShutdownServer (qboolean crash);
+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);
 
 // 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;
@@ -243,7 +264,6 @@ void fractalnoise(unsigned char *noise, int size, int startgrid);
 void fractalnoisequick(unsigned char *noise, int size, int startgrid);
 
 #include "palette.h"
-#include "image.h"
 
 void Sys_Shared_Init(void);