From c51e116c7d97aa96b2293f4302c496aefae60be0 Mon Sep 17 00:00:00 2001 From: Jaime Passos Date: Wed, 13 Nov 2019 13:00:57 -0300 Subject: [PATCH] actually, --- src/info.c | 4 ---- src/p_user.c | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/info.c b/src/info.c index 4812e7e8a..cf6380aab 100644 --- a/src/info.c +++ b/src/info.c @@ -822,11 +822,7 @@ state_t states[NUMSTATES] = {SPR_PLAY, SPR2_NSTD, 7, {NULL}, 0, 0, S_PLAY_NIGHTS_STAND}, // S_PLAY_NIGHTS_STAND {SPR_PLAY, SPR2_NFLT, 7, {NULL}, 0, 0, S_PLAY_NIGHTS_FLOAT}, // S_PLAY_NIGHTS_FLOAT {SPR_PLAY, SPR2_NSTN, 2, {NULL}, 0, 0, S_PLAY_NIGHTS_STUN}, // S_PLAY_NIGHTS_STUN -#ifndef ROTSPRITE {SPR_PLAY, SPR2_NPUL, 1, {NULL}, 0, 0, S_PLAY_NIGHTS_PULL}, // S_PLAY_NIGHTS_PULL -#else - {SPR_PLAY, SPR2_NPUL, 1, {A_RollAngle}, 30, 0, S_PLAY_NIGHTS_PULL}, // S_PLAY_NIGHTS_PULL -#endif {SPR_PLAY, SPR2_NATK, 1, {NULL}, 0, 0, S_PLAY_NIGHTS_ATTACK}, // S_PLAY_NIGHTS_ATTACK // NiGHTS Player, flying and drilling diff --git a/src/p_user.c b/src/p_user.c index 216ca770b..4fc4ff7bb 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -6748,6 +6748,12 @@ static void P_DoNiGHTSCapsule(player_t *player) P_SetPlayerMobjState(player->mo, S_PLAY_ROLL); } +#ifdef ROTSPRITE + if ((player->mo->state == &states[S_PLAY_NIGHTS_PULL]) + && (player->mo->sprite2 == SPR2_NGT0)) + player->mo->rollangle += ANG30; +#endif + if (G_IsSpecialStage(gamemap)) { // In special stages, share rings. Everyone gives up theirs to the capsule player always, because we can't have any individualism here! for (i = 0; i < MAXPLAYERS; i++)