X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_main.c;h=343aadbac0309e53066f95e8066571e9f7a12bea;hp=8ec423e155436ed763d5fc2c4ed21fd47b5e4307;hb=4d33dcb245a32cf4c44807e8b53e4fccea944633;hpb=e3451fce2f390ba1d8eaac1215709e114d50c663

diff --git a/cl_main.c b/cl_main.c
index 8ec423e1..343aadba 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;
 
 /*
@@ -350,11 +360,25 @@ Sends a disconnect message to the server
 This is also called on Host_Error, so it shouldn't cause any errors
 =====================
 */
-void CL_Disconnect(void)
+void CL_Disconnect(qbool kicked, const char *fmt, ... )
 {
+	va_list argptr;
+	char reason[512];
+
 	if (cls.state == ca_dedicated)
 		return;
 
+	if(fmt)
+	{
+		va_start(argptr,fmt);
+		dpvsnprintf(reason,sizeof(reason),fmt,argptr);
+		va_end(argptr);
+	}
+	else
+	{
+		dpsnprintf(reason, sizeof(reason), "Disconnect by user");
+	}
+
 	if (Sys_CheckParm("-profilegameonly"))
 		Sys_AllowProfiling(false);
 
@@ -385,32 +409,41 @@ void CL_Disconnect(void)
 	else if (cls.netcon)
 	{
 		sizebuf_t buf;
-		unsigned char bufdata[8];
+		unsigned char bufdata[520];
 		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)
-		memset(&buf, 0, sizeof(buf));
-		buf.data = bufdata;
-		buf.maxsize = sizeof(bufdata);
-		if (cls.protocol == PROTOCOL_QUAKEWORLD)
+		if(!kicked)
 		{
-			Con_DPrint("Sending drop command\n");
-			MSG_WriteByte(&buf, qw_clc_stringcmd);
-			MSG_WriteString(&buf, "drop");
-		}
-		else
-		{
-			Con_DPrint("Sending clc_disconnect\n");
-			MSG_WriteByte(&buf, clc_disconnect);
+			// send disconnect message 3 times to improve chances of server
+			// receiving it (but it still fails sometimes)
+			memset(&buf, 0, sizeof(buf));
+			buf.data = bufdata;
+			buf.maxsize = sizeof(bufdata);
+			if (cls.protocol == PROTOCOL_QUAKEWORLD)
+			{
+				Con_DPrint("Sending drop command\n");
+				MSG_WriteByte(&buf, qw_clc_stringcmd);
+				MSG_WriteString(&buf, "drop");
+			}
+			else
+			{
+				Con_DPrint("Sending clc_disconnect\n");
+				MSG_WriteByte(&buf, clc_disconnect);
+				if(cls.protocol == PROTOCOL_DARKPLACES8)
+					MSG_WriteString(&buf, reason);
+			}
+			NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol, 10000, 0, false);
+			NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol, 10000, 0, false);
+			NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol, 10000, 0, false);
 		}
-		NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol, 10000, 0, false);
-		NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol, 10000, 0, false);
-		NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol, 10000, 0, false);
+
 		NetConn_Close(cls.netcon);
 		cls.netcon = NULL;
-		Con_Printf("Disconnected\n");
+		if(fmt)
+			Con_Printf("Disconnect: %s\n", reason);
+		else
+			Con_Printf("Disconnected\n");
 	}
 	cls.state = ca_disconnected;
 	cl.islocalgame = false;
@@ -418,8 +451,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 +468,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 +538,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(false, Cmd_Argc(cmd) > 1 ? Cmd_Argv(cmd, 1) : NULL);
 }
 
 
@@ -543,8 +579,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)
 		{
@@ -572,6 +608,11 @@ static void CL_EstablishConnection_Local(void)
 		CL_EstablishConnection("local:1", -2);
 }
 
+static qbool CL_Intermission(void)
+{
+	return cl.intermission;
+}
+
 /*
 ==============
 CL_PrintEntities_f
@@ -607,7 +648,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");
@@ -654,7 +695,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
@@ -764,7 +805,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;
@@ -2461,7 +2502,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",
@@ -2475,10 +2516,33 @@ static void CL_MeshEntities_Restart(void)
 	for (i = 0; i < NUM_MESHENTITIES; i++)
 	{
 		ent = cl_meshentities + i;
+		Mod_Mesh_Destroy(ent->render.model);
 		Mod_Mesh_Create(ent->render.model, cl_meshentitynames[i]);
 	}
 }
 
+static void CL_MeshEntities_Start(void)
+{
+	int i;
+	entity_t *ent;
+	for(i = 0; i < NUM_MESHENTITIES; i++)
+	{
+		ent = cl_meshentities + i;
+		Mod_Mesh_Create(ent->render.model, cl_meshentitynames[i]);
+	}
+}
+
+static void CL_MeshEntities_Shutdown(void)
+{
+	int i;
+	entity_t *ent;
+	for(i = 0; i < NUM_MESHENTITIES; i++)
+	{
+		ent = cl_meshentities + i;
+		Mod_Mesh_Destroy(ent->render.model);
+	}
+}
+
 static void CL_MeshEntities_Init(void)
 {
 	int i;
@@ -2515,7 +2579,7 @@ static void CL_MeshEntities_Init(void)
 		CL_UpdateRenderEntity(&ent->render);
 	}
 	cl_meshentities[MESH_UI].render.flags = RENDER_NOSELFSHADOW;
-	R_RegisterModule("cl_meshentities", CL_MeshEntities_Restart, CL_MeshEntities_Restart, CL_MeshEntities_Restart, CL_MeshEntities_Restart, CL_MeshEntities_Restart);
+	R_RegisterModule("cl_meshentities", CL_MeshEntities_Start, CL_MeshEntities_Shutdown, CL_MeshEntities_Restart, CL_MeshEntities_Restart, CL_MeshEntities_Restart);
 }
 
 void CL_MeshEntities_Scene_Clear(void)
@@ -2537,10 +2601,6 @@ void CL_MeshEntities_Scene_FinalizeRenderEntity(void)
 	VectorCopy(ent->render.model->normalmaxs, ent->render.maxs);
 }
 
-static void CL_MeshEntities_Shutdown(void)
-{
-}
-
 extern cvar_t r_overheadsprites_pushback;
 extern cvar_t r_fullbright_directed_pitch_relative;
 extern cvar_t r_fullbright_directed_pitch;
@@ -2713,6 +2773,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;
 
@@ -2721,7 +2796,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();
@@ -2764,9 +2838,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);
@@ -2877,7 +2950,7 @@ void CL_Shutdown (void)
 	S_StopAllSounds();
 	
 	// disconnect client from server if active
-	CL_Disconnect();
+	CL_Disconnect(false, NULL);
 	
 	CL_Video_Shutdown();
 
@@ -3054,6 +3127,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;
 	}
 }