diff --git a/src/k_kart.c b/src/k_kart.c index 59271a1e4..6496f3e8e 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -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))); } diff --git a/src/st_stuff.c b/src/st_stuff.c index 99188e919..5ca3f9d91 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -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; diff --git a/src/v_video.c b/src/v_video.c index bb118d269..dbb3b385b 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -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); } } }