OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- removed special treatment for not using stdint.h with MSVC. Current compiler versions have this file.

Browse source 
- removed use of finesine for creating the player backdrop for the menu display. This mostly uses the code from the old 2.0 floating point version but fixes some of the constants in there which were not correct.
This commit is contained in:
Christoph Oelckers 2016-03-24 11:30:11 +01:00
commit c83ad9df6c
7 changed files with 81 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/menu/menu.cpp
View file

@ -78,7 +78,7 @@ FButtonStatus MenuButtons[NUM_MKEYS];
int MenuButtonTickers[NUM_MKEYS];
bool MenuButtonOrigin[NUM_MKEYS];
int BackbuttonTime;
fixed_t BackbuttonAlpha;
float BackbuttonAlpha;
static bool MenuEnabled = true;
@ -274,7 +274,7 @@ void DMenu::Drawer ()
}
else
{
screen->DrawTexture(tex, x, y, DTA_CleanNoMove, true, DTA_Alpha, BackbuttonAlpha, TAG_DONE);
screen->DrawTexture(tex, x, y, DTA_CleanNoMove, true, DTA_AlphaF, BackbuttonAlpha, TAG_DONE);
}
}
}
@ -680,12 +680,13 @@ void M_Ticker (void)
}
if (BackbuttonTime > 0)
{
if (BackbuttonAlpha < OPAQUE) BackbuttonAlpha += OPAQUE/10;
if (BackbuttonAlpha < 1.f) BackbuttonAlpha += .1f;
if (BackbuttonAlpha > 1.f) BackbuttonAlpha = 1.f;
BackbuttonTime--;
}
else
{
if (BackbuttonAlpha > 0) BackbuttonAlpha -= OPAQUE/10;
if (BackbuttonAlpha > 0) BackbuttonAlpha -= .1f;
if (BackbuttonAlpha < 0) BackbuttonAlpha = 0;
}
}