zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 11:40:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Duke: Adjust alphatabs checking to activate features when numalphatabs >= 15 instead of 16 so that my precise mode can be used.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5900 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2016-10-20 06:26:04 +00:00
parent c9de8faefb
commit 60231e53a4
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
polymer/eduke32/source/menus.h
View file

@ -451,7 +451,8 @@ extern int32_t m_mouselastactivity;
#else #else
extern int32_t m_mousewake_watchpoint, m_menuchange_watchpoint; extern int32_t m_mousewake_watchpoint, m_menuchange_watchpoint;
// alpha increments of 3 --> 255 / 3 = 85 --> round up to power of 2 --> 128 --> divide by 2 --> 64 alphatabs required // alpha increments of 3 --> 255 / 3 = 85 --> round up to power of 2 --> 128 --> divide by 2 --> 64 alphatabs required
# define MOUSEALPHA ((getrendermode() == REND_CLASSIC && numalphatabs < 64) ? 0 : clamp((totalclock - m_mouselastactivity - 90)*3, 0, 255)) // use 16 anyway :P
# define MOUSEALPHA ((getrendermode() == REND_CLASSIC && numalphatabs < 15) ? 0 : clamp((totalclock - m_mouselastactivity - 90)*3, 0, 255))
# define MOUSEACTIVECONDITION (totalclock - m_mouselastactivity < M_MOUSETIMEOUT) # define MOUSEACTIVECONDITION (totalclock - m_mouselastactivity < M_MOUSETIMEOUT)
# define MOUSEACTIVECONDITIONAL(condition) (MOUSEACTIVECONDITION && (condition)) # define MOUSEACTIVECONDITIONAL(condition) (MOUSEACTIVECONDITION && (condition))
# define MOUSEINACTIVECONDITIONAL(condition) (!MOUSEACTIVECONDITION && (condition)) # define MOUSEINACTIVECONDITIONAL(condition) (!MOUSEACTIVECONDITION && (condition))

4
polymer/eduke32/source/screentext.c
View file

@ -33,7 +33,7 @@ int32_t hud_glowingquotes = 1;
// alpha increments of 8 --> 256 / 8 = 32 --> round up to power of 2 --> 32 --> divide by 2 --> 16 alphatabs required // alpha increments of 8 --> 256 / 8 = 32 --> round up to power of 2 --> 32 --> divide by 2 --> 16 alphatabs required
#define ftapulseshade \ #define ftapulseshade \
((hud_glowingquotes && ((getrendermode() == REND_CLASSIC && numalphatabs < 16) || ps->fta >= FTAOPAQUETIME)) ? \ ((hud_glowingquotes && ((getrendermode() == REND_CLASSIC && numalphatabs < 15) || ps->fta >= FTAOPAQUETIME)) ? \
(sintable[((uint32_t)ps->fta << 7) & 2047] >> 11) : \ (sintable[((uint32_t)ps->fta << 7) & 2047] >> 11) : \
(sintable[((uint32_t)FTAOPAQUETIME << 7) & 2047] >> 11)) (sintable[((uint32_t)FTAOPAQUETIME << 7) & 2047] >> 11))
@ -1033,7 +1033,7 @@ static inline int32_t texto(int32_t t)
static inline int32_t texta(int32_t t) static inline int32_t texta(int32_t t)
{ {
if (getrendermode() == REND_CLASSIC && numalphatabs < 16) if (getrendermode() == REND_CLASSIC && numalphatabs < 15)
{ {
if (t > 4) return 0; if (t > 4) return 0;
if (t > 2) return 85; if (t > 2) return 85;