(Round 3) Break up host_cmd.c

[xonotic/darkplaces.git] / quakedef.h

diff --git a/quakedef.h b/quakedef.h
index d07a93a5a38b9494c0848901866892247c3e5e2c..ff021f17091b85fefa58e9eb167d4fe2d664e622 100644 (file)
--- a/quakedef.h
+++ b/quakedef.h
@@ -376,7 +376,6 @@ extern char engineversion[128];
 #include "sys.h"
 #include "vid.h"
 #include "mathlib.h"
-#include "hook.h"
 
 #include "r_textures.h"
 
@@ -407,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;
@@ -429,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 */
@@ -516,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);
@@ -530,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);