Minor tweaks of makepalookup() and hicinit().

git-svn-id: https://svn.eduke32.com/eduke32@2558 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-03-28 19:42:49 +00:00
parent 26d2cf7e01
commit 0ea9feee2d
2 changed files with 15 additions and 18 deletions

View file

@ -13435,16 +13435,12 @@ void makepalookup(int32_t palnum, const char *remapbuf, int8_t r, int8_t g, int8
for (i=0; i<256; i++) for (i=0; i<256; i++)
{ {
ptr = (char *)(FP_OFF(palookup[0])+remapbuf[i]); ptr = palookup[0] + remapbuf[i];
ptr2 = (char *)(FP_OFF(palookup[palnum])+i); ptr2 = palookup[palnum] + i;
for (j=0; j<numshades; j++) for (j=0; j<numshades; j++)
{ *ptr2 = *ptr; ptr += 256; ptr2 += 256; } { *ptr2 = *ptr; ptr += 256; ptr2 += 256; }
} }
#if defined(USE_OPENGL)
palookupfog[palnum].r = 0;
palookupfog[palnum].g = 0;
palookupfog[palnum].b = 0;
#endif
} }
else else
{ {
@ -13463,12 +13459,13 @@ void makepalookup(int32_t palnum, const char *remapbuf, int8_t r, int8_t g, int8
ptr[2] + mulscale16(b-ptr[2],palscale)); ptr[2] + mulscale16(b-ptr[2],palscale));
} }
} }
}
#if defined(USE_OPENGL) #if defined(USE_OPENGL)
palookupfog[palnum].r = r; palookupfog[palnum].r = r;
palookupfog[palnum].g = g; palookupfog[palnum].g = g;
palookupfog[palnum].b = b; palookupfog[palnum].b = b;
#endif #endif
}
} }
// //

View file

@ -76,21 +76,21 @@ void hicinit(void)
if (hr->skybox) if (hr->skybox)
{ {
for (j=5; j>=0; j--) for (j=5; j>=0; j--)
{
if (hr->skybox->face[j]) if (hr->skybox->face[j])
{
Bfree(hr->skybox->face[j]); Bfree(hr->skybox->face[j]);
}
}
Bfree(hr->skybox); Bfree(hr->skybox);
} }
if (hr->filename) Bfree(hr->filename);
if (hr->filename)
Bfree(hr->filename);
Bfree(hr); Bfree(hr);
hr = next; hr = next;
} }
} }
memset(hicreplc,0,sizeof(hicreplc));
Bmemset(hicreplc,0,sizeof(hicreplc));
hicfirstinit = 1; hicfirstinit = 1;
} }