intermission: store the current time to completed_time only on the first svc_intermis...

[xonotic/darkplaces.git] / cl_parse.c

diff --git a/cl_parse.c b/cl_parse.c
index 4d7c814188acd9ef3313925a9ac06fbe4d7b144d..4a06924c29b283b946280d47b4798a2ad038740e 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -477,6 +477,9 @@ static void QW_CL_RequestNextDownload(void)
 
                cls.qw_downloadtype = dl_none;
 
+               // parse the Q3 shader files
+               Mod_LoadQ3Shaders();
+
                // touch all of the precached models that are still loaded so we can free
                // anything that isn't needed
                if (!sv.active)
@@ -945,6 +948,10 @@ void CL_BeginDownloads(qboolean aborteddownload)
        {
                // loading models
 
+               // parse the Q3 shader files
+               if (cl.loadmodel_current < 2)
+                       Mod_LoadQ3Shaders();
+
                for (;cl.loadmodel_current < cl.loadmodel_total;cl.loadmodel_current++)
                {
                        if (cl.model_precache[cl.loadmodel_current] && cl.model_precache[cl.loadmodel_current]->Draw)
@@ -2539,6 +2546,15 @@ void CL_ParsePointParticles(void)
        CL_ParticleEffect(effectindex, count, origin, origin, velocity, velocity, NULL, 0);
 }
 
+void CL_ParsePointParticles1(void)
+{
+       int effectindex;
+       vec3_t origin;
+       effectindex = (unsigned short)MSG_ReadShort();
+       MSG_ReadVector(origin, cls.protocol);
+       CL_ParticleEffect(effectindex, 1, origin, origin, vec3_origin, vec3_origin, NULL, 0);
+}
+
 typedef struct cl_iplog_item_s
 {
        char *address;
@@ -2697,6 +2713,9 @@ qboolean CL_ExaminePrintString(const char *text)
        if (!strcmp(text, "Client ping times:\n"))
        {
                cl.parsingtextmode = CL_PARSETEXTMODE_PING;
+               // hide ping reports in demos
+               if (cls.demoplayback)
+                       cl.parsingtextexpectingpingforscores = 1;
                for(cl.parsingtextplayerindex = 0; cl.parsingtextplayerindex < cl.maxclients && !cl.scores[cl.parsingtextplayerindex].name[0]; cl.parsingtextplayerindex++)
                        ;
                if (cl.parsingtextplayerindex >= cl.maxclients) // should never happen, since the client itself should be in cl.scores
@@ -2833,12 +2852,13 @@ extern cvar_t slowmo;
 static void CL_NetworkTimeReceived(double newtime)
 {
        double timehigh;
-       cl.mtime[1] = max(cl.mtime[0], newtime - 0.1);
+       cl.mtime[1] = cl.mtime[0];
        cl.mtime[0] = newtime;
        if (cls.timedemo || (cl.islocalgame && !sv_fixedframeratesingleplayer.integer) || cl.mtime[1] == cl.mtime[0] || cls.signon < SIGNONS)
                cl.time = cl.mtime[1] = newtime;
        else if (cls.protocol != PROTOCOL_QUAKEWORLD && !cls.demoplayback)
        {
+               cl.mtime[1] = max(cl.mtime[1], cl.mtime[0] - 0.1);
                if (developer.integer >= 100 && vid_activewindow)
                {
                        if (cl.time < cl.mtime[1] - (cl.mtime[0] - cl.mtime[1]))
@@ -3178,16 +3198,18 @@ void CL_ParseServerMessage(void)
                                break;
 
                        case qw_svc_intermission:
+                               if(!cl.intermission)
+                                       cl.completed_time = cl.time;
                                cl.intermission = 1;
-                               cl.completed_time = cl.time;
                                MSG_ReadVector(cl.qw_intermission_origin, cls.protocol);
                                for (i = 0;i < 3;i++)
                                        cl.qw_intermission_angles[i] = MSG_ReadAngle(cls.protocol);
                                break;
 
                        case qw_svc_finale:
+                               if(!cl.intermission)
+                                       cl.completed_time = cl.time;
                                cl.intermission = 2;
-                               cl.completed_time = cl.time;
                                SCR_CenterPrint(MSG_ReadString ());
                                break;
 
@@ -3634,19 +3656,22 @@ void CL_ParseServerMessage(void)
                                break;
 
                        case svc_intermission:
+                               if(!cl.intermission)
+                                       cl.completed_time = cl.time;
                                cl.intermission = 1;
-                               cl.completed_time = cl.time;
                                break;
 
                        case svc_finale:
+                               if(!cl.intermission)
+                                       cl.completed_time = cl.time;
                                cl.intermission = 2;
-                               cl.completed_time = cl.time;
                                SCR_CenterPrint(MSG_ReadString ());
                                break;
 
                        case svc_cutscene:
+                               if(!cl.intermission)
+                                       cl.completed_time = cl.time;
                                cl.intermission = 3;
-                               cl.completed_time = cl.time;
                                SCR_CenterPrint(MSG_ReadString ());
                                break;
 
@@ -3713,6 +3738,9 @@ void CL_ParseServerMessage(void)
                        case svc_pointparticles:
                                CL_ParsePointParticles();
                                break;
+                       case svc_pointparticles1:
+                               CL_ParsePointParticles1();
+                               break;
                        }
                }
        }