X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=quakedef.h;h=ff021f17091b85fefa58e9eb167d4fe2d664e622;hb=85c0b97d3d2dd7306129d7ff7519fed9f8ae2b25;hp=36d19b57800afba5857609b2a3d5dc25dbf9c652;hpb=c38d0d2d6409d9b3174b6cf04f1bd09694cbfc81;p=xonotic%2Fdarkplaces.git

diff --git a/quakedef.h b/quakedef.h
index 36d19b57..ff021f17 100644
--- 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
@@ -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,13 +519,24 @@ 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);
@@ -531,9 +544,9 @@ 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(cmd_state_t *cmd);
-void Host_ClientCommands(const char *fmt, ...) DP_FUNC_PRINTF(1);
-void Host_ShutdownServer(void);
-void Host_Reconnect_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);