Fix compiling in VS2019 - wrong include syntax for local includes.

[xonotic/darkplaces.git] / quakedef.h

diff --git a/quakedef.h b/quakedef.h
index f2acede25f7b8448706594dd2470d2b56efcc872..ff021f17091b85fefa58e9eb167d4fe2d664e622 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
@@ -178,7 +176,7 @@ extern char engineversion[128];
 // NUM_AMBIENTS to NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS - 1 = normal entity sounds
 // NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS to total_channels = static sounds
 #define        MAX_DYNAMIC_CHANNELS    512
-#define        MAX_CHANNELS                    1028
+#define        MAX_CHANNELS                    (8192 + 4)
 #define        MODLIST_TOTALSIZE               256
 #define        MAX_FAVORITESERVERS             256
 #define        MAX_DECALSYSTEM_QUEUE   1024
@@ -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
@@ -239,6 +235,8 @@ extern char engineversion[128];
 //#define STAT_TIME                    17 ///< FTE
 //#define STAT_VIEW2           20 ///< FTE
 #define STAT_VIEWZOOM          21 ///< DP
+#define MIN_VM_STAT         32 ///< stat range available to VM_SV_AddStat
+#define MAX_VM_STAT         220 ///< stat range available to VM_SV_AddStat
 #define STAT_MOVEVARS_AIRACCEL_QW_STRETCHFACTOR 220 ///< DP
 #define STAT_MOVEVARS_AIRCONTROL_PENALTY                                       221 ///< DP
 #define STAT_MOVEVARS_AIRSPEEDLIMIT_NONQW 222 ///< DP
@@ -408,6 +406,7 @@ extern char engineversion[128];
 extern qboolean noclip_anglehack;
 
 extern cvar_t developer;
+extern cvar_t developer_entityparsing;
 extern cvar_t developer_extra;
 extern cvar_t developer_insane;
 extern cvar_t developer_loadfile;
@@ -430,6 +429,9 @@ extern cvar_t sessionid;
 # define USE_RWOPS             1
 # define LINK_TO_ZLIB  1
 # define LINK_TO_LIBVORBIS 1
+#ifdef USEXMP
+# define LINK_TO_LIBXMP 1 // nyov: if someone can test with the android NDK compiled libxmp?
+#endif
 # define DP_MOBILETOUCH        1
 # define DP_FREETYPE_STATIC 1
 #elif TARGET_OS_IPHONE /* must come first because it also defines MACOSX */
@@ -517,24 +519,35 @@ qboolean Sys_HaveSSE2(void);
 #include "glquake.h"
 
 #include "palette.h"
-
-/// 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;
-/// equal to Sys_DirtyTime() at the start of this host frame
-extern double host_dirtytime;
+typedef enum host_state_e
+{
+       host_shutdown,
+       host_init,
+       host_loading,
+       host_active
+} host_state_t;
+
+typedef struct host_s
+{
+       int state;
+       int framecount; // incremented every frame, never reset (checked by Host_Error and Host_SaveConfig_f)
+       double realtime; // the accumulated mainloop time since application started (with filtering), without any slowmo or clamping
+       double dirtytime; // the main loop wall time for this frame, equal to Sys_DirtyTime() at the start of this host frame
+       jmp_buf abortframe;
+} host_t;
+
+extern host_t host;
 
 void Host_InitCommands(void);
 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_ClientCommands(const char *fmt, ...) DP_FUNC_PRINTF(1);
-void Host_ShutdownServer(void);
-void Host_Reconnect_f(void);
-void Host_NoOperation_f(void);
+void Host_Quit_f(cmd_state_t *cmd);
+void SV_ClientCommands(const char *fmt, ...) DP_FUNC_PRINTF(1);
+void SV_Shutdown(void);
+void CL_Reconnect_f(cmd_state_t *cmd);
+void Host_NoOperation_f(cmd_state_t *cmd);
 void Host_LockSession(void);
 void Host_UnlockSession(void);