From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 2 Mar 2004 05:34:58 +0000 (+0000)
Subject: fix rtlights cubemapname load/save
X-Git-Tag: xonotic-v0.1.0preview~6048
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=11f44fe577fdd8cb46e66cd4d9697c92cf5254a1;p=xonotic%2Fdarkplaces.git

fix rtlights cubemapname load/save


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3955 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/r_shadow.c b/r_shadow.c
index 713a8904..c1f41eee 100644
--- a/r_shadow.c
+++ b/r_shadow.c
@@ -2601,12 +2601,12 @@ void R_Shadow_LoadWorldLights(void)
 				shadow = false;
 				t++;
 			}
-			a = sscanf(t, "%f %f %f %f %f %f %f %d \"%s\" %f %f %f %f", &origin[0], &origin[1], &origin[2], &radius, &color[0], &color[1], &color[2], &style, cubemapname, &corona, &angles[0], &angles[1], &angles[2]);
+			a = sscanf(t, "%f %f %f %f %f %f %f %d %s %f %f %f %f", &origin[0], &origin[1], &origin[2], &radius, &color[0], &color[1], &color[2], &style, cubemapname, &corona, &angles[0], &angles[1], &angles[2]);
 			if (a < 13)
 				VectorClear(angles);
 			if (a < 10)
 				corona = 0;
-			if (a < 9)
+			if (a < 9 || !strcmp(cubemapname, "\"\""))
 				cubemapname[0] = 0;
 			*s = '\n';
 			if (a < 8)
@@ -2646,7 +2646,7 @@ void R_Shadow_SaveWorldLights(void)
 	buf = NULL;
 	for (light = r_shadow_worldlightchain;light;light = light->next)
 	{
-		sprintf(line, "%s%f %f %f %f %f %f %f %d \"%s\" %f %f %f %f\n", light->shadow ? "" : "!", light->origin[0], light->origin[1], light->origin[2], light->radius / r_editlights_rtlightssizescale.value, light->color[0] / r_editlights_rtlightscolorscale.value, light->color[1] / r_editlights_rtlightscolorscale.value, light->color[2] / r_editlights_rtlightscolorscale.value, light->style, light->cubemapname ? light->cubemapname : "", light->corona, light->angles[0], light->angles[1], light->angles[2]);
+		sprintf(line, "%s%f %f %f %f %f %f %f %d %s %f %f %f %f\n", light->shadow ? "" : "!", light->origin[0], light->origin[1], light->origin[2], light->radius / r_editlights_rtlightssizescale.value, light->color[0] / r_editlights_rtlightscolorscale.value, light->color[1] / r_editlights_rtlightscolorscale.value, light->color[2] / r_editlights_rtlightscolorscale.value, light->style, light->cubemapname ? light->cubemapname : "\"\"", light->corona, light->angles[0], light->angles[1], light->angles[2]);
 		if (bufchars + (int) strlen(line) > bufmaxchars)
 		{
 			bufmaxchars = bufchars + strlen(line) + 2048;