Make connections atomic. Disconnect before trying to connect.

[xonotic/darkplaces.git] / quakedef.h

diff --git a/quakedef.h b/quakedef.h
index c374573bde8f0bfe818e1f0aff8a23a731c83449..4e483f93fd329a68b67676412e1a578d80f670fe 100644 (file)
--- a/quakedef.h
+++ b/quakedef.h
@@ -114,8 +114,6 @@ extern char engineversion[128];
 #define        MAX_BINDMAPS                    8
 #define        MAX_PARTICLES_INITIAL   8192
 #define        MAX_PARTICLES                   8192
-#define        MAX_DECALS_INITIAL              1024
-#define        MAX_DECALS                              1024
 #define        MAX_ENITIES_INITIAL             256
 #define        MAX_STATICENTITIES              256
 #define        MAX_EFFECTS                             16
@@ -155,7 +153,7 @@ extern char engineversion[128];
 #define        SAVEGAME_COMMENT_LENGTH 39 ///< max comment length of savegame in menu
 #define        MAX_CLIENTNETWORKEYES   16 ///< max number of locations that can be added to pvs when culling network entities (must be at least 2 for prediction)
 #define        MAX_LEVELNETWORKEYES    512 ///< max number of locations that can be added to pvs when culling network entities (must be at least 2 for prediction)
-#define        MAX_OCCLUSION_QUERIES   4096 ///< max number of GL_ARB_occlusion_query objects that can be used in one frame
+#define        MAX_OCCLUSION_QUERIES   4096 ///< max number of query objects that can be used in one frame
 
 #define CRYPTO_HOSTKEY_HASHSIZE 8192 ///< number of hash buckets for accelerating host key lookups
 #define MAX_NETWM_ICON 352822 // 16x16, 22x22, 24x24, 32x32, 48x48, 64x64, 128x128, 256x256, 512x512
@@ -186,8 +184,6 @@ extern char engineversion[128];
 #define        MAX_BINDMAPS                    8
 #define        MAX_PARTICLES_INITIAL   8192 ///< initial allocation for cl.particles
 #define        MAX_PARTICLES                   1048576 ///< upper limit on cl.particles size
-#define        MAX_DECALS_INITIAL              8192 ///< initial allocation for cl.decals
-#define        MAX_DECALS                              1048576 ///< upper limit on cl.decals size
 #define        MAX_ENITIES_INITIAL             256 ///< initial size of cl.entities
 #define        MAX_STATICENTITIES              1024 ///< limit on size of cl.static_entities
 #define        MAX_EFFECTS                             256 ///< limit on size of cl.effects
@@ -530,11 +526,11 @@ void Host_Main(void);
 void Host_Shutdown(void);
 void Host_StartVideo(void);
 void Host_Error(const char *error, ...) DP_FUNC_PRINTF(1) DP_FUNC_NORETURN;
-void Host_Quit_f(void);
+void Host_Quit_f(cmd_state_t *cmd);
 void Host_ClientCommands(const char *fmt, ...) DP_FUNC_PRINTF(1);
 void Host_ShutdownServer(void);
-void Host_Reconnect_f(void);
-void Host_NoOperation_f(void);
+void Host_Reconnect_f(cmd_state_t *cmd);
+void Host_NoOperation_f(cmd_state_t *cmd);
 void Host_LockSession(void);
 void Host_UnlockSession(void);