X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=host.c;h=61c9bb0b05502c65d42cd7a612f1b2bb95805f90;hb=18b05eb44de9b25ecedffd2bf78388df270b07ae;hp=75ee9b3dcb77656e73a60431df287bbfe47e671d;hpb=28620abb9561ae4dfd3626c69912af0aa2e941df;p=xonotic%2Fdarkplaces.git

diff --git a/host.c b/host.c
index 75ee9b3d..61c9bb0b 100644
--- a/host.c
+++ b/host.c
@@ -109,7 +109,7 @@ void Host_EndGame (const char *format, ...)
 	va_start (argptr,format);
 	vsprintf (string,format,argptr);
 	va_end (argptr);
-	Con_DPrintf ("Host_EndGame: %s\n",string);
+	Con_DPrintf("Host_EndGame: %s\n",string);
 
 	if (sv.active)
 		Host_ShutdownServer (false);
@@ -136,8 +136,6 @@ void PRVM_ProcessError(void);
 static char hosterrorstring1[4096];
 static char hosterrorstring2[4096];
 static qboolean hosterror = false;
-extern char sv_spawnmap[MAX_QPATH];
-extern char sv_loadgame[MAX_OSPATH];
 void Host_Error (const char *error, ...)
 {
 	va_list argptr;
@@ -146,7 +144,7 @@ void Host_Error (const char *error, ...)
 	vsprintf (hosterrorstring1,error,argptr);
 	va_end (argptr);
 
-	Con_Printf ("Host_Error: %s\n", hosterrorstring1);
+	Con_Printf("Host_Error: %s\n", hosterrorstring1);
 
 	// LordHavoc: if first frame has not been shown, or currently shutting
 	// down, do Sys_Error instead
@@ -159,10 +157,6 @@ void Host_Error (const char *error, ...)
 
 	strcpy(hosterrorstring2, hosterrorstring1);
 
-	// make sure we don't get in a loading loop
-	sv_loadgame[0] = 0;
-	sv_spawnmap[0] = 0;
-
 	CL_Parse_DumpPacket();
 
 	PR_Crash();
@@ -259,9 +253,12 @@ void Host_ServerOptions (void)
 Host_InitLocal
 ======================
 */
+void Host_SaveConfig_f(void);
 void Host_InitLocal (void)
 {
 	Host_InitCommands ();
+	
+	Cmd_AddCommand("saveconfig", Host_SaveConfig_f);
 
 	Cvar_RegisterVariable (&host_framerate);
 	Cvar_RegisterVariable (&host_speeds);
@@ -299,12 +296,12 @@ void Host_InitLocal (void)
 
 /*
 ===============
-Host_WriteConfiguration
+Host_SaveConfig_f
 
 Writes key bindings and archived cvars to config.cfg
 ===============
 */
-void Host_WriteConfiguration (void)
+void Host_SaveConfig_f(void)
 {
 	qfile_t *f;
 
@@ -315,7 +312,7 @@ void Host_WriteConfiguration (void)
 		f = FS_Open ("config.cfg", "w", false);
 		if (!f)
 		{
-			Con_Printf ("Couldn't write config.cfg.\n");
+			Con_Print("Couldn't write config.cfg.\n");
 			return;
 		}
 
@@ -327,6 +324,20 @@ void Host_WriteConfiguration (void)
 }
 
 
+/*
+=================
+SV_ClientPrint
+
+Sends text across to be displayed
+FIXME: make this just a stuffed echo?
+=================
+*/
+void SV_ClientPrint(const char *msg)
+{
+	MSG_WriteByte(&host_client->message, svc_print);
+	MSG_WriteString(&host_client->message, msg);
+}
+
 /*
 =================
 SV_ClientPrintf
@@ -338,45 +349,57 @@ FIXME: make this just a stuffed echo?
 void SV_ClientPrintf(const char *fmt, ...)
 {
 	va_list argptr;
-	char string[1024];
+	char msg[4096];
 
-	va_start (argptr,fmt);
-	vsprintf (string, fmt,argptr);
-	va_end (argptr);
+	va_start(argptr,fmt);
+	vsnprintf(msg,sizeof(msg),fmt,argptr);
+	va_end(argptr);
 
-	MSG_WriteByte (&host_client->message, svc_print);
-	MSG_WriteString (&host_client->message, string);
+	SV_ClientPrint(msg);
 }
 
 /*
 =================
-SV_BroadcastPrintf
+SV_BroadcastPrint
 
 Sends text to all active clients
 =================
 */
-void SV_BroadcastPrintf(const char *fmt, ...)
+void SV_BroadcastPrint(const char *msg)
 {
-	va_list argptr;
-	char string[4096];
 	int i;
 	client_t *client;
 
-	va_start(argptr,fmt);
-	vsnprintf(string, sizeof(string), fmt,argptr);
-	va_end(argptr);
-
 	for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++)
 	{
 		if (client->spawned)
 		{
 			MSG_WriteByte(&client->message, svc_print);
-			MSG_WriteString(&client->message, string);
+			MSG_WriteString(&client->message, msg);
 		}
 	}
 
 	if (sv_echobprint.integer && cls.state == ca_dedicated)
-		Sys_Printf("%s", string);
+		Sys_Print(msg);
+}
+
+/*
+=================
+SV_BroadcastPrintf
+
+Sends text to all active clients
+=================
+*/
+void SV_BroadcastPrintf(const char *fmt, ...)
+{
+	va_list argptr;
+	char msg[4096];
+
+	va_start(argptr,fmt);
+	vsnprintf(msg,sizeof(msg),fmt,argptr);
+	va_end(argptr);
+
+	SV_BroadcastPrint(msg);
 }
 
 /*
@@ -528,7 +551,7 @@ not reinitialize anything.
 */
 void Host_ClearMemory (void)
 {
-	Con_DPrintf ("Clearing memory\n");
+	Con_DPrint("Clearing memory\n");
 	Mod_ClearAll ();
 
 	cls.signon = 0;
@@ -567,17 +590,20 @@ qboolean Host_FilterTime (double time)
 		// default to sys_ticrate (server framerate - presumably low) unless we
 		// have a good reason to run faster
 		timecap = sys_ticrate.value;
-		if (cl_avidemo.value >= 0.1f)
-			timecap = 1.0 / (double)cl_avidemo.value;
-		else if (vid_activewindow && !scr_con_current)
-			timecap = 1.0 / host_maxfps.value;
+		if (cls.state != ca_dedicated)
+		{
+			if (cl_avidemo.value >= 0.1f)
+				timecap = 1.0 / (double)cl_avidemo.value;
+			else if (vid_activewindow)
+				timecap = 1.0 / host_maxfps.value;
+		}
 
 		timeleft = oldrealtime + timecap - realtime;
 		if (timeleft > 0)
 		{
 			// don't totally hog the CPU
 			if (timeleft >= 0.02)
-				Sys_Sleep();
+				Sys_Sleep((int)(timeleft * 1000) - 5);
 			return false;
 		}
 	}
@@ -688,7 +714,7 @@ void _Host_Frame (float time)
 	static double time3 = 0;
 	int pass1, pass2, pass3;
 	usercmd_t cmd; // Used for receiving input
-	
+
 	if (setjmp(host_abortserver))
 		return;			// something bad happened, or the server disconnected
 
@@ -709,13 +735,10 @@ void _Host_Frame (float time)
 
 	// Collect input into cmd
 	IN_ProcessMove(&cmd);
-	
+
 	// process console commands
 	Cbuf_Execute();
 
-	// LordHavoc: map and load are delayed until video is initialized
-	Host_PerformSpawnServerAndLoadGame();
-
 	// if running the server locally, make intentions now
 	if (cls.state == ca_connected && sv.active)
 		CL_SendCmd(&cmd);
@@ -752,7 +775,7 @@ void _Host_Frame (float time)
 		CL_ReadFromServer();
 	}
 
-	ui_update();
+	//ui_update();
 
 	CL_VideoFrame();
 
@@ -760,18 +783,19 @@ void _Host_Frame (float time)
 	if (host_speeds.integer)
 		time1 = Sys_DoubleTime();
 
+	R_UpdateWorld();
 	CL_UpdateScreen();
 
 	if (host_speeds.integer)
 		time2 = Sys_DoubleTime();
 
 	// update audio
-	if (cls.signon == SIGNONS)
+	if (cls.signon == SIGNONS && cl.viewentity >= 0 && cl.viewentity < MAX_EDICTS && cl_entities[cl.viewentity].state_current.active)
 	{
 		// LordHavoc: this used to use renderer variables (eww)
-		vec3_t forward, right, up;
-		AngleVectors(cl.viewangles, forward, right, up);
-		S_Update(cl_entities[cl.viewentity].render.origin, forward, right, up);
+		vec3_t forward, left, up, origin;
+		Matrix4x4_ToVectors(&cl_entities[cl.viewentity].render.matrix, forward, left, up, origin);
+		S_Update(origin, forward, left, up);
 	}
 	else
 		S_Update(vec3_origin, vec3_origin, vec3_origin, vec3_origin);
@@ -826,13 +850,12 @@ void Host_Frame (float time)
 			c++;
 	}
 
-	Con_Printf ("serverprofile: %2i clients %2i msec\n",  c,  m);
+	Con_Printf("serverprofile: %2i clients %2i msec\n",  c,  m);
 }
 
 //============================================================================
 
 void Render_Init(void);
-void M_Scipt_Init ();
 
 /*
 ====================
@@ -841,6 +864,8 @@ Host_Init
 */
 void Host_Init (void)
 {
+	int i;
+
 	// LordHavoc: quake never seeded the random number generator before... heh
 	srand(time(NULL));
 
@@ -861,14 +886,13 @@ void Host_Init (void)
 	Host_InitLocal();
 	Key_Init();
 	Con_Init();
-	Chase_Init();
 	PR_Init();
 	PRVM_Init();
 	Mod_Init();
 	NetConn_Init();
 	SV_Init();
 
-	Con_Printf ("Builddate: %s\n", buildstring);
+	Con_Printf("Builddate: %s\n", buildstring);
 
 	if (cls.state != ca_dedicated)
 	{
@@ -882,23 +906,37 @@ void Host_Init (void)
 		CL_Init();
 	}
 
-	Cbuf_InsertText ("exec quake.rc\n");
-	Cbuf_Execute();
-	Cbuf_Execute();
-	Cbuf_Execute();
+	// only cvars are executed when host_initialized == false
+	if (gamemode == GAME_TEU)
+		Cbuf_InsertText("exec teu.rc\n");
+	else
+		Cbuf_InsertText("exec quake.rc\n");
 	Cbuf_Execute();
 
 	host_initialized = true;
 
-	Con_DPrintf ("========Initialized=========\n");
+	Con_DPrint("========Initialized=========\n");
 
 	if (cls.state != ca_dedicated)
 	{
 		VID_Open();
 		SCR_BeginLoadingPlaque();
+		MR_Init();
 	}
-	
-	MR_Init();
+
+	// stuff it again so the first host frame will execute it again, this time
+	// in its entirety
+	if (gamemode == GAME_TEU)
+		Cbuf_InsertText("exec teu.rc\n");
+	else
+		Cbuf_InsertText("exec quake.rc\n");
+
+	// check for special benchmark mode
+	i = COM_CheckParm("-benchmark");
+	if (i && i + 1 < com_argc)
+		Cbuf_InsertText(va("timedemo %s\n", com_argv[i + 1]));
+
+	Cbuf_Execute();
 }
 
 
@@ -916,7 +954,7 @@ void Host_Shutdown(void)
 
 	if (isdown)
 	{
-		Con_Printf ("recursive shutdown\n");
+		Con_Print("recursive shutdown\n");
 		return;
 	}
 	isdown = true;
@@ -927,9 +965,9 @@ void Host_Shutdown(void)
 
 	// AK shutdown PRVM
 	// AK hmm, no PRVM_Shutdown(); yet
-	
 
-	Host_WriteConfiguration ();
+
+	Host_SaveConfig_f();
 
 	CDAudio_Shutdown ();
 	NetConn_Shutdown ();