X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_main.c;h=4471edd3d4e24f9e6d645e2444bf406f30e75638;hp=fb456b06c4fedc0fbf53b34c03a9fc8d2c476c3e;hb=e2e22c8380e0e9e6be93a25ebf201ca932a8b7bc;hpb=c40524593d4eebc3b4bde75bb88ebaec2d64e1d3

diff --git a/cl_main.c b/cl_main.c
index fb456b06..4471edd3 100644
--- a/cl_main.c
+++ b/cl_main.c
@@ -340,6 +340,16 @@ void CL_ExpandCSQCRenderEntities(int num)
 	}
 }
 
+static void CL_ToggleMenu_Hook(void)
+{
+#ifdef CONFIG_MENU
+	// remove menu
+	if (key_dest == key_menu || key_dest == key_menu_grabbed)
+		MR_ToggleMenu(0);
+#endif
+	key_dest = key_game;
+}
+
 extern cvar_t rcon_secure;
 
 /*
@@ -387,7 +397,7 @@ void CL_Disconnect(void)
 		sizebuf_t buf;
 		unsigned char bufdata[8];
 		if (cls.demorecording)
-			CL_Stop_f(&cmd_client);
+			CL_Stop_f(cmd_local);
 
 		// send disconnect message 3 times to improve chances of server
 		// receiving it (but it still fails sometimes)
@@ -418,8 +428,13 @@ void CL_Disconnect(void)
 	cls.demoplayback = cls.timedemo = host.restless = false;
 	cls.signon = 0;
 
+	Cvar_Callback(&cl_netport);
+
 	// If we're dropped mid-connection attempt, it won't clear otherwise.
 	SCR_ClearLoadingScreen(false);
+
+	if(host.hook.SV_Shutdown)
+		host.hook.SV_Shutdown();
 }
 
 /*
@@ -430,7 +445,7 @@ This command causes the client to wait for the signon messages again.
 This is sent just before a server changes levels
 ==================
 */
-void CL_Reconnect_f(cmd_state_t *cmd)
+static void CL_Reconnect_f(cmd_state_t *cmd)
 {
 	char temp[128];
 	// if not connected, reconnect to the most recent server
@@ -500,9 +515,7 @@ static void CL_Connect_f(cmd_state_t *cmd)
 
 void CL_Disconnect_f(cmd_state_t *cmd)
 {
-	CL_Disconnect ();
-	if (sv.active)
-		SV_Shutdown ();
+	CL_Disconnect();
 }
 
 
@@ -534,7 +547,6 @@ void CL_EstablishConnection(const char *address, int firstarg)
 
 	if (LHNETADDRESS_FromString(&cls.connect_address, address, 26000) && (cls.connect_mysocket = NetConn_ChooseClientSocketForAddress(&cls.connect_address)))
 	{
-		// Disconnect from the current server, or stop a running demo.
 		cls.connect_trying = true;
 		cls.connect_remainingtries = 3;
 		cls.connect_nextsendtime = 0;
@@ -544,8 +556,8 @@ void CL_EstablishConnection(const char *address, int firstarg)
 		{
 			int i;
 			*cls.connect_userinfo = 0;
-			for(i = firstarg; i+2 <= Cmd_Argc(&cmd_client); i += 2)
-				InfoString_SetValue(cls.connect_userinfo, sizeof(cls.connect_userinfo), Cmd_Argv(&cmd_client, i), Cmd_Argv(&cmd_client, i+1));
+			for(i = firstarg; i+2 <= Cmd_Argc(cmd_local); i += 2)
+				InfoString_SetValue(cls.connect_userinfo, sizeof(cls.connect_userinfo), Cmd_Argv(cmd_local, i), Cmd_Argv(cmd_local, i+1));
 		}
 		else if(firstarg < -1)
 		{
@@ -573,6 +585,11 @@ static void CL_EstablishConnection_Local(void)
 		CL_EstablishConnection("local:1", -2);
 }
 
+static qbool CL_Intermission(void)
+{
+	return cl.intermission;
+}
+
 /*
 ==============
 CL_PrintEntities_f
@@ -608,7 +625,7 @@ List information on all models in the client modelindex
 static void CL_ModelIndexList_f(cmd_state_t *cmd)
 {
 	int i;
-	dp_model_t *model;
+	model_t *model;
 
 	// Print Header
 	Con_Printf("%3s: %-30s %-8s %-8s\n", "ID", "Name", "Type", "Triangles");
@@ -655,7 +672,7 @@ void CL_UpdateRenderEntity(entity_render_t *ent)
 {
 	vec3_t org;
 	vec_t scale;
-	dp_model_t *model = ent->model;
+	model_t *model = ent->model;
 	// update the inverse matrix for the renderer
 	Matrix4x4_Invert_Simple(&ent->inversematrix, &ent->matrix);
 	// update the animation blend state
@@ -765,7 +782,7 @@ entity_render_t *CL_NewTempEntity(double shadertime)
 	return render;
 }
 
-void CL_Effect(vec3_t org, dp_model_t *model, int startframe, int framecount, float framerate)
+void CL_Effect(vec3_t org, model_t *model, int startframe, int framecount, float framerate)
 {
 	int i;
 	cl_effect_t *e;
@@ -2462,7 +2479,7 @@ void CL_Locs_Reload_f(cmd_state_t *cmd)
 }
 
 entity_t cl_meshentities[NUM_MESHENTITIES];
-dp_model_t cl_meshentitymodels[NUM_MESHENTITIES];
+model_t cl_meshentitymodels[NUM_MESHENTITIES];
 const char *cl_meshentitynames[NUM_MESHENTITIES] =
 {
 	"MESH_SCENE",
@@ -2714,6 +2731,21 @@ void CL_UpdateEntityShading(void)
 		CL_UpdateEntityShading_Entity(r_refdef.scene.entities[i]);
 }
 
+qbool vid_opened = false;
+void CL_StartVideo(void)
+{
+	if (!vid_opened && cls.state != ca_dedicated)
+	{
+		vid_opened = true;
+#ifdef WIN32
+		// make sure we open sockets before opening video because the Windows Firewall "unblock?" dialog can screw up the graphics context on some graphics drivers
+		NetConn_UpdateSockets();
+#endif
+		VID_Start();
+		CDAudio_Startup();
+	}
+}
+
 extern cvar_t host_framerate;
 extern cvar_t host_speeds;
 
@@ -2722,7 +2754,6 @@ double CL_Frame (double time)
 	static double clframetime;
 	static double cl_timer = 0;
 	static double time1 = 0, time2 = 0, time3 = 0;
-	static double wait;
 	int pass1, pass2, pass3;
 
 	CL_VM_PreventInformationLeaks();
@@ -2765,9 +2796,8 @@ double CL_Frame (double time)
 		{
 			clframetime = cl.realframetime = max(cl_timer, 1.0 / cl_maxfps.value);
 			// when running slow, we need to sleep to keep input responsive
-			wait = bound(0, cl_maxfps_alwayssleep.value * 1000, 100000);
-			if (wait > 0)
-				Sys_Sleep((int)wait);
+			if (cl_maxfps_alwayssleep.value > 0)
+				Sys_Sleep((int)bound(0, cl_maxfps_alwayssleep.value * 1000, 100000));
 		}
 		else if (!vid_activewindow && cl_maxidlefps.value >= 1 && !cls.timedemo)
 			clframetime = cl.realframetime = max(cl_timer, 1.0 / cl_maxidlefps.value);
@@ -3055,6 +3085,11 @@ void CL_Init (void)
 
 		CL_Video_Init();
 
+		NetConn_UpdateSockets_Client();
+
 		host.hook.ConnectLocal = CL_EstablishConnection_Local;
+		host.hook.Disconnect = CL_Disconnect;
+		host.hook.CL_Intermission = CL_Intermission;
+		host.hook.ToggleMenu = CL_ToggleMenu_Hook;
 	}
 }