Merge branch 'Saturn-Next' into Saturn-Testing
This commit is contained in:
commit
4e22d3e61a
3 files changed
+6
-4
No files matched your search
+1
-1
@@ -484,7 +484,7 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = {
|
||||
//
|
||||
UINT8 K_RainbowColor(void)
|
||||
{
|
||||
const INT32 time = cv_reducevfx.value ? (leveltime >> 3) : leveltime;
|
||||
const tic_t time = cv_reducevfx.value ? (leveltime >> 3) : leveltime;
|
||||
return (UINT8)(1 + (time % (MAXSKINCOLORS-1)));
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -720,7 +720,7 @@ void ST_DrawDemoTitleEntry(void)
|
||||
static void ST_MayonakaStatic(void)
|
||||
{
|
||||
INT32 flag;
|
||||
if (cv_lessflicker.value)
|
||||
if (cv_lessflicker.value || cv_reducevfx.value)
|
||||
flag = V_70TRANS;
|
||||
else
|
||||
flag = (leveltime%2) ? V_90TRANS : V_70TRANS;
|
||||
|
||||
+4
-2
@@ -3821,7 +3821,7 @@ void InitColorLUT(colorlookup_t *lut, RGBA_t *palette, boolean makecolors)
|
||||
lut->init = true;
|
||||
memcpy(lut->palette, palette, palsize);
|
||||
|
||||
for (i = 0; i < 0xFFFF; i++)
|
||||
for (i = 0; i < 0x10000; i++)
|
||||
lut->table[i] = 0xFFFF;
|
||||
|
||||
if (makecolors)
|
||||
@@ -3834,7 +3834,9 @@ void InitColorLUT(colorlookup_t *lut, RGBA_t *palette, boolean makecolors)
|
||||
{
|
||||
for (b = 0; b < 0xFF; b++)
|
||||
{
|
||||
lut->table[i] = GetColorLUT(lut, r, g, b);
|
||||
i = CLUTINDEX(r, g, b);
|
||||
if (lut->table[i] == 0xFFFF)
|
||||
lut->table[i] = NearestPaletteColor(r, g, b, palette);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user