merged CL_MoveParticles, CL_MoveDecals, and R_MoveExplosions into their

[xonotic/darkplaces.git] / cl_parse.c

diff --git a/cl_parse.c b/cl_parse.c
index e3b39714052c87c76037be074430e53df38fe4b6..90874778dc6b8cfad1ddcbc8fd8c35526fc7d1c8 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -365,7 +365,8 @@ void CL_ParseEntityLump(char *entdata)
                {
                        r_refdef.fog_start = 0;
                        r_refdef.fog_alpha = 1;
-                       sscanf(value, "%f %f %f %f %f %f", &r_refdef.fog_density, &r_refdef.fog_red, &r_refdef.fog_green, &r_refdef.fog_blue, &r_refdef.fog_start, &r_refdef.fog_alpha);
+                       r_refdef.fog_end = 16384;
+                       sscanf(value, "%f %f %f %f %f %f %f", &r_refdef.fog_density, &r_refdef.fog_red, &r_refdef.fog_green, &r_refdef.fog_blue, &r_refdef.fog_alpha, &r_refdef.fog_start, &r_refdef.fog_end);
                }
                else if (!strcmp("fog_density", key))
                        r_refdef.fog_density = atof(value);
@@ -375,6 +376,12 @@ void CL_ParseEntityLump(char *entdata)
                        r_refdef.fog_green = atof(value);
                else if (!strcmp("fog_blue", key))
                        r_refdef.fog_blue = atof(value);
+               else if (!strcmp("fog_alpha", key))
+                       r_refdef.fog_alpha = atof(value);
+               else if (!strcmp("fog_start", key))
+                       r_refdef.fog_start = atof(value);
+               else if (!strcmp("fog_end", key))
+                       r_refdef.fog_end = atof(value);
        }
 }
 
@@ -3327,14 +3334,20 @@ void CL_ParseServerMessage(void)
                                EntityFrameQW_CL_ReadFrame(false);
                                // first update is the final signon stage
                                if (cls.signon == SIGNONS - 1)
+                               {
                                        cls.signon = SIGNONS;
+                                       CL_SignonReply ();
+                               }
                                break;
 
                        case qw_svc_deltapacketentities:
                                EntityFrameQW_CL_ReadFrame(true);
                                // first update is the final signon stage
                                if (cls.signon == SIGNONS - 1)
+                               {
                                        cls.signon = SIGNONS;
+                                       CL_SignonReply ();
+                               }
                                break;
 
                        case qw_svc_maxspeed: