zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-06-03 02:30:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- refactoring of palette loader.

Browse source
This commit is contained in:
Christoph Oelckers 2019-10-20 22:26:53 +02:00
parent 6e7db1b63a
commit 449a5a4717
6 changed files with 20 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

18
source/rr/src/common.cpp
View file

@ -992,20 +992,20 @@ void G_DoAutoload(const char *dirname)
void G_LoadLookups(void)
{
int32_t fp, j;
int32_t j;
if ((fp=kopen4loadfrommod("lookup.dat",0)) == -1)
if ((fp=kopen4loadfrommod("lookup.dat",1)) == -1)
return;
auto fr = kopenFileReader("lookup.dat", 0);
if (!fr.isOpen())
return;
j = paletteLoadLookupTable(fp);
j = paletteLoadLookupTable(fr);
if (j < 0)
{
if (j == -1)
initprintf("ERROR loading \"lookup.dat\": failed reading enough data.\n");
return kclose(fp);
return;
}
uint8_t paldata[768];
@ -1015,8 +1015,8 @@ void G_LoadLookups(void)
// Account for TITLE and REALMS swap between basepal number and on-disk order.
int32_t basepalnum = (j == 3 || j == 4) ? 4+3-j : j;
if (kread_and_test(fp, paldata, 768))
return kclose(fp);
if (fr.Read(paldata, 768) != 768)
return;
for (bssize_t k = 0; k < 768; k++)
paldata[k] <<= 2;
@ -1028,8 +1028,6 @@ void G_LoadLookups(void)
paldata[767] = palette[767];
paletteSetColorTable(DRUGPAL, paldata);
kclose(fp);
if (RR)
{
char table[256];