minor clean-ups

This commit is contained in:
Fabian Greffrath 2022-04-27 09:52:52 +02:00
parent d096479bd2
commit 66724b6391
2 changed files with 7 additions and 4 deletions

View File

@ -1045,6 +1045,9 @@ void P_SetupPsprites(player_t *player)
// Called every tic by player thinking routine.
//
#define WEAPON_CENTERED 1
#define WEAPON_BOBBING 2
void P_MovePsprites(player_t *player)
{
pspdef_t *psp = player->psprites;
@ -1092,7 +1095,7 @@ void P_MovePsprites(player_t *player)
{
}
// [FG] not attacking means idle
else if (!player->attackdown || center_weapon == 2)
else if (!player->attackdown || center_weapon == WEAPON_BOBBING)
{
int angle = (128*leveltime) & FINEMASK;
psp->sx2 = FRACUNIT + FixedMul(player->bob, finecosine[angle]);
@ -1100,7 +1103,7 @@ void P_MovePsprites(player_t *player)
psp->sy2 = WEAPONTOP + FixedMul(player->bob, finesine[angle]);
}
// [FG] center the weapon sprite horizontally and push up vertically
else if (center_weapon == 1)
else if (center_weapon == WEAPON_CENTERED)
{
psp->sx2 = FRACUNIT;
psp->sy2 = WEAPONTOP;

View File

@ -221,8 +221,6 @@ void R_RenderMaskedSegRange(drawseg_t *ds, int x1, int x2)
// CALLED: CORE LOOPING ROUTINE.
//
static boolean didsolidcol; // True if at least one column was marked solid
#define HEIGHTBITS 12
#define HEIGHTUNIT (1<<HEIGHTBITS)
@ -321,6 +319,8 @@ void R_FixWiggle (sector_t *sector)
}
}
static boolean didsolidcol; // True if at least one column was marked solid
static void R_RenderSegLoop (void)
{
fixed_t texturecolumn = 0; // shut up compiler warning