one last try to beat the OSX texture scrolling bug (set activetexture

[xonotic/darkplaces.git] / cl_parse.c

diff --git a/cl_parse.c b/cl_parse.c
index e3b39714052c87c76037be074430e53df38fe4b6..46c3c64b40c1eae393e79c8043ac978b3c970ed4 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,11 +376,19 @@ 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);
        }
 }
 
 extern void CL_Locs_Reload_f(void);
 extern void CL_VM_Init (void);
+static const vec3_t defaultmins = {-4096, -4096, -4096};
+static const vec3_t defaultmaxs = {4096, 4096, 4096};
 static void CL_SetupWorldModel(void)
 {
        // update the world model
@@ -388,16 +397,9 @@ static void CL_SetupWorldModel(void)
 
        // set up csqc world for collision culling
        if (cl.worldmodel)
-       {
-               VectorCopy(cl.worldmodel->normalmins, cl.world.areagrid_mins);
-               VectorCopy(cl.worldmodel->normalmaxs, cl.world.areagrid_maxs);
-       }
+               World_SetSize(&cl.world, cl.worldmodel->name, cl.worldmodel->normalmins, cl.worldmodel->normalmaxs);
        else
-       {
-               VectorSet(cl.world.areagrid_mins, -4096, -4096, -4096);
-               VectorSet(cl.world.areagrid_maxs, 4096, 4096, 4096);
-       }
-       World_Clear(&cl.world);
+               World_SetSize(&cl.world, "", defaultmins, defaultmaxs);
 
        // load or reload .loc file for team chat messages
        CL_Locs_Reload_f();
@@ -1149,7 +1151,7 @@ void CL_BeginDownloads_f(void)
        // prevent cl_begindownloads from being issued multiple times in one match
        // to prevent accidentally cancelled downloads
        if(cl.loadbegun)
-               Con_DPrintf("cl_begindownloads is only valid once per match\n");
+               Con_Printf("cl_begindownloads is only valid once per match\n");
        else
                CL_BeginDownloads(false);
 }
@@ -1275,6 +1277,7 @@ void CL_DownloadBegin_f(void)
 
 void CL_StopDownload_f(void)
 {
+       Curl_CancelAll();
        if (cls.qw_downloadname[0])
        {
                Con_Printf("Download of %s aborted\n", cls.qw_downloadname);
@@ -1331,7 +1334,8 @@ An svc_signonnum has been received, perform a client side setup
 */
 static void CL_SignonReply (void)
 {
-       Con_DPrintf("CL_SignonReply: %i\n", cls.signon);
+       if (developer.integer >= 100)
+               Con_Printf("CL_SignonReply: %i\n", cls.signon);
 
        switch (cls.signon)
        {
@@ -3327,14 +3331,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: