model_shared: Move skinframe struct to r_textures.h

[xonotic/darkplaces.git] / cl_main.c

diff --git a/cl_main.c b/cl_main.c
index fb456b06c4fedc0fbf53b34c03a9fc8d2c476c3e..3f24ce7b359094df4cc767bb0cc0d0bd89b2ddb3 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -430,7 +430,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
@@ -534,7 +534,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;
@@ -573,6 +572,11 @@ static void CL_EstablishConnection_Local(void)
                CL_EstablishConnection("local:1", -2);
 }
 
+static qbool CL_Intermission(void)
+{
+       return cl.intermission;
+}
+
 /*
 ==============
 CL_PrintEntities_f
@@ -3056,5 +3060,6 @@ void CL_Init (void)
                CL_Video_Init();
 
                host.hook.ConnectLocal = CL_EstablishConnection_Local;
+               host.hook.CL_Intermission = CL_Intermission;
        }
 }