Remove some jankiness from spectators.

This commit is contained in:
toasterbabe 2017-07-08 11:41:20 +01:00
parent 317259a459
commit a0cf28671c

View file

@ -5207,16 +5207,16 @@ static void P_SpectatorMovement(player_t *player)
if (!(cmd->angleturn & TICCMD_RECEIVED)) if (!(cmd->angleturn & TICCMD_RECEIVED))
ticmiss++; ticmiss++;
if (player->mo->z > player->mo->ceilingz - player->mo->height)
player->mo->z = player->mo->ceilingz - player->mo->height;
if (player->mo->z < player->mo->floorz)
player->mo->z = player->mo->floorz;
if (cmd->buttons & BT_JUMP) if (cmd->buttons & BT_JUMP)
player->mo->z += FRACUNIT*16; player->mo->z += FRACUNIT*16;
else if (cmd->buttons & BT_USE) else if (cmd->buttons & BT_USE)
player->mo->z -= FRACUNIT*16; player->mo->z -= FRACUNIT*16;
if (player->mo->z > player->mo->ceilingz - player->mo->height)
player->mo->z = player->mo->ceilingz - player->mo->height;
if (player->mo->z < player->mo->floorz)
player->mo->z = player->mo->floorz;
// Aiming needed for SEENAMES, etc. // Aiming needed for SEENAMES, etc.
// We may not need to fire as a spectator, but this is still handy! // We may not need to fire as a spectator, but this is still handy!
player->aiming = cmd->aiming<<FRACBITS; player->aiming = cmd->aiming<<FRACBITS;
@ -6752,6 +6752,7 @@ static void P_MovePlayer(player_t *player)
if (player->spectator) if (player->spectator)
{ {
player->mo->eflags &= ~MFE_VERTICALFLIP; // deflip...
P_SpectatorMovement(player); P_SpectatorMovement(player);
return; return;
} }