X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=host.c;h=f70a17f7fd06c775dc2a12d73e5540396f09fbee;hb=a630c1de6e1244d544616a5eb8a8b3b39a716ee9;hp=8d1eba3187b554a86c7817fbf426e5683592028b;hpb=f44bba4d0245519b71fbea8970ae7823260862ce;p=xonotic%2Fdarkplaces.git

diff --git a/host.c b/host.c
index 8d1eba31..f70a17f7 100644
--- a/host.c
+++ b/host.c
@@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "progsvm.h"
 #include "csprogs.h"
 #include "sv_demo.h"
+#include "snd_main.h"
 
 /*
 
@@ -60,7 +61,7 @@ double host_starttime = 0;
 cvar_t host_framerate = {0, "host_framerate","0", "locks frame timing to this value in seconds, 0.05 is 20fps for example, note that this can easily run too fast, use cl_maxfps if you want to limit your framerate instead, or sys_ticrate to limit server speed"};
 // shows time used by certain subsystems
 cvar_t host_speeds = {0, "host_speeds","0", "reports how much time is used in server/graphics/sound"};
-cvar_t host_sleep = {0, "host_sleep","0", "gives up some processing time to other applications each frame, value in milliseconds"};
+cvar_t host_sleep = {0, "host_sleep","1", "gives up some processing time to other applications each frame, value in milliseconds"};
 cvar_t cl_minfps = {CVAR_SAVE, "cl_minfps", "40", "minimum fps target - while the rendering performance is below this, it will drift toward lower quality"};
 cvar_t cl_minfps_fade = {CVAR_SAVE, "cl_minfps_fade", "0.2", "how fast the quality adapts to varying framerate"};
 cvar_t cl_minfps_qualitymax = {CVAR_SAVE, "cl_minfps_qualitymax", "1", "highest allowed drawdistance multiplier"};
@@ -587,7 +588,7 @@ Host_TimeReport
 Returns a time report string, for example for
 ==================
 */
-const char *Host_TimingReport()
+const char *Host_TimingReport(void)
 {
 	return va("%.1f%% CPU, %.2f%% lost, offset avg %.1fms, max %.1fms, sdev %.1fms", svs.perf_cpuload * 100, svs.perf_lost * 100, svs.perf_offset_avg * 1000, svs.perf_offset_max * 1000, svs.perf_offset_sdev * 1000);
 }
@@ -671,6 +672,7 @@ void Host_Main(void)
 		cl.islocalgame = NetConn_IsLocalGame();
 
 		// get new key events
+		SndSys_SendKeyEvents();
 		Sys_SendKeyEvents();
 
 		NetConn_UpdateSockets();
@@ -693,6 +695,7 @@ void Host_Main(void)
 		if (sv.active ? sv_timer > 0 : cl_timer > 0)
 		{
 			// process console commands
+			CL_VM_PreventInformationLeaks();
 			Cbuf_Execute();
 		}
 
@@ -823,7 +826,7 @@ void Host_Main(void)
 	//
 	//-------------------
 
-		if (cls.state != ca_dedicated && (cl_timer > 0 || cls.timedemo))
+		if (cls.state != ca_dedicated && (cl_timer > 0 || cls.timedemo || cl_maxfps.value < 1))
 		{
 			// decide the simulation time
 			if (cls.capturevideo.active)
@@ -991,8 +994,12 @@ static void Host_Init (void)
 		srand(time(NULL));
 
 	// FIXME: this is evil, but possibly temporary
+	// LordHavoc: doesn't seem very temporary...
+	// LordHavoc: enabled this by default on debug
+#ifndef DEBUG
 // COMMANDLINEOPTION: Console: -developer enables warnings and other notices (RECOMMENDED for mod developers)
 	if (COM_CheckParm("-developer"))
+#endif
 	{
 		developer.value = developer.integer = 1;
 		developer.string = "1";