From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 29 Jul 2002 10:09:45 +0000 (+0000)
Subject: corrected fullbright map handling for the case when the fullbright bmodel is not... 
X-Git-Tag: RELEASE_0_2_0_RC1~418
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=20c20466403850892cadf21acf6f492359d4f40a;p=xonotic%2Fdarkplaces.git

corrected fullbright map handling for the case when the fullbright bmodel is not the running map, but one of the imported bmodels instead, also corrected a comment about r_ambient


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

diff --git a/gl_rsurf.c b/gl_rsurf.c
index e3429922..16ab5c58 100644
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -378,7 +378,7 @@ static void R_BuildLightMap (msurface_t *surf, int dlightchanged)
 	lightmap = surf->samples;
 
 // set to full bright if no light data
-	if ((currentrenderentity->effects & EF_FULLBRIGHT) || !cl.worldmodel->lightdata)
+	if ((currentrenderentity->effects & EF_FULLBRIGHT) || !currentrenderentity->model->lightdata)
 	{
 		bl = blocklights;
 		for (i = 0;i < size3;i++)
@@ -387,7 +387,7 @@ static void R_BuildLightMap (msurface_t *surf, int dlightchanged)
 	else
 	{
 // clear to no light
-		j = r_ambient.value * 512.0f; // would be 256.0f logically, but using 512.0f to match winquake style
+		j = r_ambient.value * 512.0f; // would be 128.0f logically, but using 512.0f to match winquake style
 		if (j)
 		{
 			bl = blocklights;