X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_parse.c;h=90874778dc6b8cfad1ddcbc8fd8c35526fc7d1c8;hb=a757d821b12d5ec84cf4d76a9572d9c90ca77324;hp=9c5411552949fba24d8d726a99b72668cd28976a;hpb=fd091d66e2673b19eb9c7d73d95160ef874de5e6;p=xonotic%2Fdarkplaces.git

diff --git a/cl_parse.c b/cl_parse.c
index 9c541155..90874778 100644
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -362,7 +362,12 @@ void CL_ParseEntityLump(char *entdata)
 		else if (!strcmp("qlsky", key)) // non-standard, introduced by QuakeLives (EEK)
 			R_SetSkyBox(value);
 		else if (!strcmp("fog", key))
-			sscanf(value, "%f %f %f %f", &r_refdef.fog_density, &r_refdef.fog_red, &r_refdef.fog_green, &r_refdef.fog_blue);
+		{
+			r_refdef.fog_start = 0;
+			r_refdef.fog_alpha = 1;
+			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);
 		else if (!strcmp("fog_red", key))
@@ -371,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);
 	}
 }
 
@@ -524,9 +535,6 @@ 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)
@@ -993,10 +1001,6 @@ 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)
@@ -1912,7 +1916,6 @@ void CL_ParseStatic (int large)
 	ent->render.framelerp = 0;
 	// make torchs play out of sync
 	ent->render.frame1time = ent->render.frame2time = lhrandom(-10, -1);
-	ent->render.colormap = -1; // no special coloring
 	ent->render.skinnum = ent->state_baseline.skin;
 	ent->render.effects = ent->state_baseline.effects;
 	ent->render.alpha = 1;
@@ -3331,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: