Simplify map title rendering code and enable alpha for classic renderer

This commit is contained in:
nukeykt 2019-09-13 19:15:16 +09:00 committed by Christoph Oelckers
parent 2b443c2eac
commit f6cd86d77e

View file

@ -1242,15 +1242,11 @@ void viewDrawMapTitle(void)
if (!gShowMapTitle || gGameMenuMgr.m_bActive) if (!gShowMapTitle || gGameMenuMgr.m_bActive)
return; return;
int seconds = (gLevelTime / kTicsPerSec); int const fadeStartTic = int(1.f*kTicsPerSec);
int millisecs = (gLevelTime % kTicsPerSec) * 33; int const fadeEndTic = int(1.25f*kTicsPerSec);
if (seconds > 3) if (gLevelTime > fadeEndTic)
return; return;
uint8_t const alpha = clamp((gLevelTime-fadeStartTic)*255/(fadeEndTic-fadeStartTic), 0, 255);
const int noAlphaForSecs = 1;
uint8_t alpha = videoGetRenderMode() != REND_CLASSIC || numalphatabs >= 15 ?
seconds < noAlphaForSecs ? 0 : clamp(((seconds-noAlphaForSecs)*1000+millisecs)/4, 0, 255)
: 0;
if (alpha != 255) if (alpha != 255)
{ {