Subversion Repositories eduke32

Rev

Rev 8623 | Rev 8716 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 8623 Rev 8650
Line 420... Line 420...
420
void G_UpdatePlayerFromMenu(void);
420
void G_UpdatePlayerFromMenu(void);
421
void M32RunScript(const char *s);
421
void M32RunScript(const char *s);
422
void P_DoQuote(int32_t q,DukePlayer_t *p);
422
void P_DoQuote(int32_t q,DukePlayer_t *p);
423
void P_SetGamePalette(DukePlayer_t *player, uint32_t palid, int32_t set);
423
void P_SetGamePalette(DukePlayer_t *player, uint32_t palid, int32_t set);
424
424
425
#define NEG_ALPHA_TO_BLEND(alpha, blend, orientation) do { \
-
 
426
    if (alpha < 0) { blend = -alpha; alpha = 0; orientation |= RS_TRANS1; } \
-
 
427
} while (0)
-
 
428
-
 
429
// Cstat protection mask for (currently) spawned MASKWALL* sprites.
425
// Cstat protection mask for (currently) spawned MASKWALL* sprites.
430
// TODO: look at more cases of cstat=(cstat&PROTECTED)|ADDED in A_Spawn()?
426
// TODO: look at more cases of cstat=(cstat&PROTECTED)|ADDED in A_Spawn()?
431
// 2048+(32+16)+8+4
427
// 2048+(32+16)+8+4
432
#define SPAWN_PROTECT_CSTAT_MASK (CSTAT_SPRITE_NOSHADE|CSTAT_SPRITE_ALIGNMENT_SLAB|CSTAT_SPRITE_XFLIP|CSTAT_SPRITE_YFLIP);
428
#define SPAWN_PROTECT_CSTAT_MASK (CSTAT_SPRITE_NOSHADE|CSTAT_SPRITE_ALIGNMENT_SLAB|CSTAT_SPRITE_XFLIP|CSTAT_SPRITE_YFLIP);
433
429
Line 604... Line 600...
604
void El_SetCON(const char *conluacode);
600
void El_SetCON(const char *conluacode);
605
#endif
601
#endif
606
602
607
EXTERN_INLINE_HEADER void G_SetStatusBarScale(int32_t sc);
603
EXTERN_INLINE_HEADER void G_SetStatusBarScale(int32_t sc);
608
604
609
EXTERN_INLINE_HEADER void SetIfGreater(int32_t *variable, int32_t potentialValue);
-
 
610
-
 
611
#endif
605
#endif
612
606
613
#ifdef __cplusplus
607
#ifdef __cplusplus
614
}
608
}
615
#endif
609
#endif
Line 640... Line 634...
640
{
634
{
641
    ud.statusbarscale = clamp(sc, 50, 100);
635
    ud.statusbarscale = clamp(sc, 50, 100);
642
    G_UpdateScreenArea();
636
    G_UpdateScreenArea();
643
}
637
}
644
638
645
// the point of this is to prevent re-running a function or calculation passed to potentialValue
-
 
646
// without making a new variable under each individual circumstance
-
 
647
EXTERN_INLINE void SetIfGreater(int32_t *variable, int32_t potentialValue)
-
 
648
{
-
 
649
    if (potentialValue > *variable)
-
 
650
        *variable = potentialValue;
-
 
651
}
-
 
652
-
 
653
#endif
639
#endif
654
640
655
#endif
641
#endif
656
642
657
#endif
643
#endif