From 476d53d3058832b2ad646feed6f0130e5ead4225 Mon Sep 17 00:00:00 2001 From: Lach Date: Thu, 20 Jul 2023 19:02:13 +1000 Subject: [PATCH 1/4] WIP: Hardcode MT_BOOSTPAD --- src/deh_tables.c | 9 +++++++++ src/info.c | 37 +++++++++++++++++++++++++++++++++++++ src/info.h | 15 +++++++++++++++ src/p_enemy.c | 26 +++++++++++++++++++++++++- src/p_mobj.c | 3 +++ 5 files changed, 89 insertions(+), 1 deletion(-) diff --git a/src/deh_tables.c b/src/deh_tables.c index 10453cf52..d43c6457e 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -301,6 +301,7 @@ actionpointer_t actionpointers[] = {{A_InvincSparkleRotate}, "A_INVINCSPARKLEROTATE"}, {{A_SpawnItemDebrisCloud}, "A_SPAWNITEMDEBRISCLOUD"}, {{A_RingShooterFace}, "A_RINGSHOOTERFACE"}, + {{A_TextureAnimate}, "A_TEXTUREANIMATE"}, {{NULL}, "NONE"}, @@ -4250,6 +4251,11 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi "S_DASHRING_VERTICAL_FLASH1", "S_DASHRING_VERTICAL_FLASH2", + // Boost pads + "S_BOOSTPAD", + "S_BOOSTPAD_SMALL", + "S_BOOSTPAD_TINY", + // Various plants "S_SONICBUSH", @@ -5621,6 +5627,9 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t "MT_DASHRING", "MT_RAINBOWDASHRING", + // Boost pads + "MT_BOOSTPAD", + // Various plants "MT_SONICBUSH", diff --git a/src/info.c b/src/info.c index fc26bf3d7..8aabe2828 100644 --- a/src/info.c +++ b/src/info.c @@ -720,6 +720,11 @@ char sprnames[NUMSPRITES + 1][5] = // Dash Rings "RAIR", + // Boost pads + "BSTP", + "BSTS", + "BSTT", + // Various plants "SBUS", @@ -4935,6 +4940,11 @@ state_t states[NUMSTATES] = {SPR_NULL, 0, TICRATE/3 - 2, {NULL}, 0, 0, S_DASHRING_VERTICAL_FLASH2}, // S_DASHRING_VERTICAL_FLASH1 {SPR_RAIR, FF_ADD|3, 2, {NULL}, 0, 0, S_DASHRING_VERTICAL_FLASH1}, // S_DASHRING_VERTICAL_FLASH2 + // Boost pads + {SPR_BSTP, FF_FLOORSPRITE, 1, {A_TextureAnimate}, 5, 2, S_BOOSTPAD}, // S_BOOSTPAD + {SPR_BSTS, FF_FLOORSPRITE, 1, {A_TextureAnimate}, 5, 2, S_BOOSTPAD_SMALL}, // S_BOOSTPAD_SMALL + {SPR_BSTT, FF_FLOORSPRITE, 1, {A_TextureAnimate}, 5, 2, S_BOOSTPAD_TINY}, // S_BOOSTPAD_TINY + // Various plants {SPR_SBUS, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SONICBUSH @@ -26797,6 +26807,33 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, + { // MT_BOOSTPAD + 510, // doomednum + S_BOOSTPAD, // spawnstate + 1, // spawnhealth + S_NULL, // seestate + sfx_None, // seesound + 0, // reactiontime + sfx_None, // attacksound + S_NULL, // painstate + 0, // painchance + sfx_None, // painsound + S_NULL, // meleestate + S_NULL, // missilestate + S_NULL, // deathstate + S_NULL, // xdeathstate + sfx_None, // deathsound + 0, // speed + 91*FRACUNIT, // radius + 16*FRACUNIT, // height + 0, // dispoffset + 0, // mass + 0, // damage + sfx_None, // activesound + MF_ENEMY|MF_SPECIAL, // flags + S_NULL // raisestate + }, + { // MT_SONICBUSH, 715, // doomednum S_SONICBUSH, // spawnstate diff --git a/src/info.h b/src/info.h index b77591fb2..ea8b21b2b 100644 --- a/src/info.h +++ b/src/info.h @@ -294,6 +294,7 @@ enum actionnum A_INVINCSPARKLEROTATE, A_SPAWNITEMDEBRISCLOUD, A_RINGSHOOTERFACE, + A_TEXTUREANIMATE, NUMACTIONS }; @@ -568,6 +569,7 @@ void A_FlameShieldPaper(); void A_InvincSparkleRotate(); void A_SpawnItemDebrisCloud(); void A_RingShooterFace(); +void A_TextureAnimate(); extern boolean actionsoverridden[NUMACTIONS]; @@ -1271,6 +1273,11 @@ typedef enum sprite // Dash Rings SPR_RAIR, + // Boost pads + SPR_BSTP, + SPR_BSTS, + SPR_BSTT, + // Various plants SPR_SBUS, @@ -5383,6 +5390,11 @@ typedef enum state S_DASHRING_VERTICAL_FLASH1, S_DASHRING_VERTICAL_FLASH2, + // Boost pads + S_BOOSTPAD, + S_BOOSTPAD_SMALL, + S_BOOSTPAD_TINY, + // Various plants S_SONICBUSH, @@ -6789,6 +6801,9 @@ typedef enum mobj_type MT_DASHRING, MT_RAINBOWDASHRING, + // Boost pads + MT_BOOSTPAD, + // Various plants MT_SONICBUSH, diff --git a/src/p_enemy.c b/src/p_enemy.c index 478a7441b..bf4165281 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -330,6 +330,7 @@ void A_FlameShieldPaper(mobj_t *actor); void A_InvincSparkleRotate(mobj_t *actor); void A_SpawnItemDebrisCloud(mobj_t *actor); void A_RingShooterFace(mobj_t *actor); +void A_TextureAnimate(mobj_t *actor); //for p_enemy.c @@ -13721,7 +13722,8 @@ A_SpawnItemDebrisCloud (mobj_t *actor) } } -// sets the actor's +// Assumes the actor is the screen of a Ring Shooter +// Changes the screen to display the WANTED icon of the Ring Shooter's owner, stretching it to match the screen's dimensions // vars do nothing void A_RingShooterFace(mobj_t *actor) { @@ -13732,3 +13734,25 @@ void A_RingShooterFace(mobj_t *actor) Obj_UpdateRingShooterFace(actor); } + +// Syncs the actor's frame with the animated texture ticker in P_UpdateSpecials +// Call continuously to simulate an animated texture +// var1 and var2 act like FF_ANIMATE, i.e.: +// var1 = number of additional frames to cycle through +// var2 = number of tics to display each frame +void A_TextureAnimate(mobj_t *actor) +{ + INT32 locvar1 = var1; + INT32 locvar2 = var2; + state_t *state = actor->state; + + if (LUA_CallAction(A_TEXTUREANIMATE, actor)) + { + return; + } + + if (actor->frame & FF_ANIMATE) // this doesn't work if you're animating on your own as well + return; + + actor->frame = (actor->frame & ~FF_FRAMEMASK) | ((state->frame & FF_FRAMEMASK) + ((leveltime / state->var2) % (state->var1 + 1))) +} diff --git a/src/p_mobj.c b/src/p_mobj.c index fc35e3a39..67c60aa93 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -10438,6 +10438,9 @@ static void P_DefaultMobjShadowScale(mobj_t *thing) case MT_DRIFTCLIP: thing->shadowscale = FRACUNIT/3; break; + case MT_BOOSTPAD: + thing->shadowscale = 0; + break; default: if (thing->flags & (MF_ENEMY|MF_BOSS)) thing->shadowscale = FRACUNIT; From 2d7ae88586311b7867e3d289c75baf88cfb68764 Mon Sep 17 00:00:00 2001 From: Lach Date: Fri, 21 Jul 2023 19:19:28 +1000 Subject: [PATCH 2/4] Hardcode MT_BOOSTPAD as MT_SNEAKERPANEL --- src/deh_tables.c | 12 ++-- src/info.c | 18 ++--- src/info.h | 14 ++-- src/k_objects.h | 6 ++ src/objects/CMakeLists.txt | 1 + src/objects/sneaker-panel.c | 129 ++++++++++++++++++++++++++++++++++++ src/p_enemy.c | 3 +- src/p_map.c | 11 +++ src/p_mobj.c | 13 +++- 9 files changed, 182 insertions(+), 25 deletions(-) create mode 100644 src/objects/sneaker-panel.c diff --git a/src/deh_tables.c b/src/deh_tables.c index da72e26ec..89b14223a 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -4251,10 +4251,10 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi "S_DASHRING_VERTICAL_FLASH1", "S_DASHRING_VERTICAL_FLASH2", - // Boost pads - "S_BOOSTPAD", - "S_BOOSTPAD_SMALL", - "S_BOOSTPAD_TINY", + // Sneaker Panels + "S_SNEAKERPANEL", + "S_SNEAKERPANEL_SMALL", + "S_SNEAKERPANEL_TINY", // Various plants "S_SONICBUSH", @@ -5627,8 +5627,8 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t "MT_DASHRING", "MT_RAINBOWDASHRING", - // Boost pads - "MT_BOOSTPAD", + // Sneaker Panels + "MT_SNEAKERPANEL", // Various plants "MT_SONICBUSH", diff --git a/src/info.c b/src/info.c index 8aabe2828..7309a520d 100644 --- a/src/info.c +++ b/src/info.c @@ -720,7 +720,7 @@ char sprnames[NUMSPRITES + 1][5] = // Dash Rings "RAIR", - // Boost pads + // Sneaker Panels "BSTP", "BSTS", "BSTT", @@ -4940,10 +4940,10 @@ state_t states[NUMSTATES] = {SPR_NULL, 0, TICRATE/3 - 2, {NULL}, 0, 0, S_DASHRING_VERTICAL_FLASH2}, // S_DASHRING_VERTICAL_FLASH1 {SPR_RAIR, FF_ADD|3, 2, {NULL}, 0, 0, S_DASHRING_VERTICAL_FLASH1}, // S_DASHRING_VERTICAL_FLASH2 - // Boost pads - {SPR_BSTP, FF_FLOORSPRITE, 1, {A_TextureAnimate}, 5, 2, S_BOOSTPAD}, // S_BOOSTPAD - {SPR_BSTS, FF_FLOORSPRITE, 1, {A_TextureAnimate}, 5, 2, S_BOOSTPAD_SMALL}, // S_BOOSTPAD_SMALL - {SPR_BSTT, FF_FLOORSPRITE, 1, {A_TextureAnimate}, 5, 2, S_BOOSTPAD_TINY}, // S_BOOSTPAD_TINY + // Sneaker Panels + {SPR_BSTP, FF_FLOORSPRITE|FF_FULLBRIGHT, 1, {A_TextureAnimate}, 5, 2, S_SNEAKERPANEL}, // S_SNEAKERPANEL + {SPR_BSTS, FF_FLOORSPRITE|FF_FULLBRIGHT, 1, {A_TextureAnimate}, 5, 2, S_SNEAKERPANEL_SMALL}, // S_SNEAKERPANEL_SMALL + {SPR_BSTT, FF_FLOORSPRITE|FF_FULLBRIGHT, 1, {A_TextureAnimate}, 5, 2, S_SNEAKERPANEL_TINY}, // S_SNEAKERPANEL_TINY // Various plants {SPR_SBUS, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SONICBUSH @@ -26807,10 +26807,10 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - { // MT_BOOSTPAD + { // MT_SNEAKERPANEL 510, // doomednum - S_BOOSTPAD, // spawnstate - 1, // spawnhealth + S_SNEAKERPANEL, // spawnstate + 1000, // spawnhealth S_NULL, // seestate sfx_None, // seesound 0, // reactiontime @@ -26830,7 +26830,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 0, // mass 0, // damage sfx_None, // activesound - MF_ENEMY|MF_SPECIAL, // flags + MF_SPECIAL|MF_ENEMY, // flags -- NOTE: IIRC MF_ENEMY was added by mappers to make conveyor belt setups more convenient S_NULL // raisestate }, diff --git a/src/info.h b/src/info.h index ea8b21b2b..5f816accc 100644 --- a/src/info.h +++ b/src/info.h @@ -1273,7 +1273,7 @@ typedef enum sprite // Dash Rings SPR_RAIR, - // Boost pads + // Sneaker Panels SPR_BSTP, SPR_BSTS, SPR_BSTT, @@ -5390,10 +5390,10 @@ typedef enum state S_DASHRING_VERTICAL_FLASH1, S_DASHRING_VERTICAL_FLASH2, - // Boost pads - S_BOOSTPAD, - S_BOOSTPAD_SMALL, - S_BOOSTPAD_TINY, + // Sneaker Panels + S_SNEAKERPANEL, + S_SNEAKERPANEL_SMALL, + S_SNEAKERPANEL_TINY, // Various plants S_SONICBUSH, @@ -6801,8 +6801,8 @@ typedef enum mobj_type MT_DASHRING, MT_RAINBOWDASHRING, - // Boost pads - MT_BOOSTPAD, + // Sneaker Panels + MT_SNEAKERPANEL, // Various plants MT_SONICBUSH, diff --git a/src/k_objects.h b/src/k_objects.h index ab4d259e6..f72ad1e20 100644 --- a/src/k_objects.h +++ b/src/k_objects.h @@ -193,6 +193,12 @@ void Obj_DashRingTouch(mobj_t *mobj, player_t *player); void Obj_DashRingPlayerThink(player_t *player); boolean Obj_DashRingPlayerHasNoGravity(player_t *player); +/* Sneaker Panels */ +void Obj_SneakerPanelSpawn(mobj_t *mobj); +void Obj_SneakerPanelSetup(mobj_t *mobj, mapthing_t *mthing); +void Obj_SneakerPanelThink(mobj_t *mobj); +void Obj_SneakerPanelCollide(mobj_t *pad, mobj_t *mo); + #ifdef __cplusplus } // extern "C" #endif diff --git a/src/objects/CMakeLists.txt b/src/objects/CMakeLists.txt index 2e0f65913..4eaa1d2f5 100644 --- a/src/objects/CMakeLists.txt +++ b/src/objects/CMakeLists.txt @@ -26,4 +26,5 @@ target_sources(SRB2SDL2 PRIVATE powerup-aura.cpp symbol.c dash-rings.c + sneaker-panel.c ) diff --git a/src/objects/sneaker-panel.c b/src/objects/sneaker-panel.c new file mode 100644 index 000000000..8d27503a8 --- /dev/null +++ b/src/objects/sneaker-panel.c @@ -0,0 +1,129 @@ +#include "../r_main.h" +#include "../p_slopes.h" +#include "../p_local.h" +#include "../k_kart.h" + +#define SNEAKERPANEL_RADIUS (64*FRACUNIT) + +static void SneakerPanelSpriteScale(mobj_t *mobj) +{ + statenum_t newState; + fixed_t spriteScale; + + if (mobj->scale == mobj->movefactor) + return; + + mobj->movefactor = mobj->scale; + + if (mobj->scale > FRACUNIT >> 1) + { + newState = S_SNEAKERPANEL; + spriteScale = FRACUNIT; + } + else if (mobj->scale > FRACUNIT >> 2) + { + newState = S_SNEAKERPANEL_SMALL; + spriteScale = FRACUNIT << 1; + } + else + { + newState = S_SNEAKERPANEL_TINY; + spriteScale = FRACUNIT << 2; + } + + if ((mobj->state - states) != newState) + { + P_SetMobjState(mobj, newState); + mobj->spritexscale = mobj->spriteyscale = spriteScale; + } +} + +void Obj_SneakerPanelSpawn(mobj_t *mobj) +{ + mobj->renderflags |= RF_OBJECTSLOPESPLAT | RF_NOSPLATBILLBOARD; + SneakerPanelSpriteScale(mobj); +} + +void Obj_SneakerPanelSetup(mobj_t *mobj, mapthing_t *mthing) +{ + if (mthing->options & MTF_OBJECTFLIP) + { + mobj->eflags |= MFE_VERTICALFLIP; + mobj->flags2 |= MF2_OBJECTFLIP; + } + P_TryMove(mobj, mobj->x, mobj->y, true, NULL); // sets standingslope + SneakerPanelSpriteScale(mobj); +} + +void Obj_SneakerPanelThink(mobj_t *mobj) +{ + // ugh, this only has to exist because of the sneaker panel spawners... + // I think, when we hardcode those, it would be good to make a specialized A_TrapShot wrapper to re-scale their spawned panels and remove this thinker + SneakerPanelSpriteScale(mobj); +} + +void Obj_SneakerPanelCollide(mobj_t *panel, mobj_t *mo) +{ + pslope_t *slope = panel->standingslope; + player_t *player = mo->player; + fixed_t playerTop = mo->z + mo->height, playerBottom = mo->z; + fixed_t panelTop, panelBottom, dist, x, y, radius; + angle_t angle; + + // only players can boost! + if (player == NULL) + return; + + // these aren't aerial boosters, so you do need to be on the ground + if (!P_IsObjectOnGround(mo)) + return; + + // player needs to have the same gravflip status as the panel + if ((panel->eflags & MFE_VERTICALFLIP) != (mo->eflags & MFE_VERTICALFLIP)) + return; + + // find the x and y coordinates of the player relative to the booster's angle + dist = R_PointToDist2(panel->x, panel->y, mo->x, mo->y); + angle = R_PointToAngle2(panel->x, panel->y, mo->x, mo->y) - panel->angle; + x = P_ReturnThrustX(NULL, angle, dist); + y = P_ReturnThrustY(NULL, angle, dist); + + // check that these coordinates fall within the square panel + radius = FixedMul(SNEAKERPANEL_RADIUS, panel->scale); + + if (x < -radius || x > radius || y < -radius || y > radius) + return; // out of bounds + + // check that the player is within reasonable vertical bounds + if (slope == NULL) + { + panelTop = panel->z + panel->height; + panelBottom = panel->z; + } + else + { + x = P_ReturnThrustX(NULL, slope->xydirection, panel->radius); + y = P_ReturnThrustY(NULL, slope->xydirection, panel->radius); + panelTop = P_GetSlopeZAt(slope, panel->x + x, panel->y + y); + panelBottom = P_GetSlopeZAt(slope, panel->x - x, panel->y - y); + + if (panelTop < panelBottom) + { + // variable swap + panelTop = panelTop + panelBottom; + panelBottom = panelTop - panelBottom; + panelTop = panelTop - panelBottom; + } + } + + if ((playerBottom > panelTop) || (playerTop < panelBottom)) + return; + + // boost! + if (player->floorboost == 0) + player->floorboost = 3; + else + player->floorboost = 2; + + K_DoSneaker(player, 0); +} diff --git a/src/p_enemy.c b/src/p_enemy.c index bf4165281..01420801f 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -13744,7 +13744,6 @@ void A_TextureAnimate(mobj_t *actor) { INT32 locvar1 = var1; INT32 locvar2 = var2; - state_t *state = actor->state; if (LUA_CallAction(A_TEXTUREANIMATE, actor)) { @@ -13754,5 +13753,5 @@ void A_TextureAnimate(mobj_t *actor) if (actor->frame & FF_ANIMATE) // this doesn't work if you're animating on your own as well return; - actor->frame = (actor->frame & ~FF_FRAMEMASK) | ((state->frame & FF_FRAMEMASK) + ((leveltime / state->var2) % (state->var1 + 1))) + actor->frame += ((leveltime / locvar2) % (locvar1 + 1)); } diff --git a/src/p_map.c b/src/p_map.c index 2d00b808e..6c6f47e80 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -1152,6 +1152,17 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing) return K_FallingRockCollide(thing, tm.thing) ? BMIT_CONTINUE : BMIT_ABORT; } + if (thing->type == MT_SNEAKERPANEL) + { + Obj_SneakerPanelCollide(thing, tm.thing); + return BMIT_CONTINUE; + } + else if (tm.thing->type == MT_SNEAKERPANEL) + { + Obj_SneakerPanelCollide(tm.thing, thing); + return BMIT_CONTINUE; + } + //} if ((thing->type == MT_SPRINGSHELL || thing->type == MT_YELLOWSHELL) && thing->health > 0 diff --git a/src/p_mobj.c b/src/p_mobj.c index acc48e89a..171dbb056 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -9608,6 +9608,9 @@ static boolean P_MobjRegularThink(mobj_t *mobj) case MT_RAINBOWDASHRING: Obj_RainbowDashRingThink(mobj); break; + case MT_SNEAKERPANEL: + Obj_SneakerPanelThink(mobj); + break; default: // check mobj against possible water content, before movement code P_MobjCheckWater(mobj); @@ -10446,7 +10449,7 @@ static void P_DefaultMobjShadowScale(mobj_t *thing) case MT_DRIFTCLIP: thing->shadowscale = FRACUNIT/3; break; - case MT_BOOSTPAD: + case MT_SNEAKERPANEL: thing->shadowscale = 0; break; default: @@ -11005,6 +11008,9 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type) case MT_RAINBOWDASHRING: Obj_RainbowDashRingSpawn(mobj); break; + case MT_SNEAKERPANEL: + Obj_SneakerPanelSpawn(mobj); + break; default: break; } @@ -13535,6 +13541,11 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj) Obj_DashRingSetup(mobj, mthing); break; } + case MT_SNEAKERPANEL: + { + Obj_SneakerPanelSetup(mobj, mthing); + break; + } default: break; } From fd8ba4236dc2d90a288b04b5505259cd5900f1da Mon Sep 17 00:00:00 2001 From: Lach Date: Sat, 29 Jul 2023 17:51:25 +1000 Subject: [PATCH 3/4] Hardcode MT_SNEAKERPANELSPAWNER & adjust FF_GLOBALANIM behaviour --- src/deh_tables.c | 4 +++- src/info.c | 34 +++++++++++++++++++++++++++++++--- src/info.h | 6 ++++-- src/k_objects.h | 2 +- src/objects/sneaker-panel.c | 13 +++---------- src/p_enemy.c | 36 ++++++++++++++++++++++++++---------- src/p_mobj.c | 12 ++++-------- src/p_tick.c | 4 ++++ src/p_tick.h | 1 + 9 files changed, 77 insertions(+), 35 deletions(-) diff --git a/src/deh_tables.c b/src/deh_tables.c index 89b14223a..5568518dc 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -301,7 +301,7 @@ actionpointer_t actionpointers[] = {{A_InvincSparkleRotate}, "A_INVINCSPARKLEROTATE"}, {{A_SpawnItemDebrisCloud}, "A_SPAWNITEMDEBRISCLOUD"}, {{A_RingShooterFace}, "A_RINGSHOOTERFACE"}, - {{A_TextureAnimate}, "A_TEXTUREANIMATE"}, + {{A_SpawnSneakerPanel}, "A_SPAWNSNEAKERPANEL"}, {{NULL}, "NONE"}, @@ -4255,6 +4255,7 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi "S_SNEAKERPANEL", "S_SNEAKERPANEL_SMALL", "S_SNEAKERPANEL_TINY", + "S_SNEAKERPANELSPAWNER", // Various plants "S_SONICBUSH", @@ -5629,6 +5630,7 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t // Sneaker Panels "MT_SNEAKERPANEL", + "MT_SNEAKERPANELSPAWNER", // Various plants "MT_SONICBUSH", diff --git a/src/info.c b/src/info.c index 7309a520d..4aca66a8d 100644 --- a/src/info.c +++ b/src/info.c @@ -4941,9 +4941,10 @@ state_t states[NUMSTATES] = {SPR_RAIR, FF_ADD|3, 2, {NULL}, 0, 0, S_DASHRING_VERTICAL_FLASH1}, // S_DASHRING_VERTICAL_FLASH2 // Sneaker Panels - {SPR_BSTP, FF_FLOORSPRITE|FF_FULLBRIGHT, 1, {A_TextureAnimate}, 5, 2, S_SNEAKERPANEL}, // S_SNEAKERPANEL - {SPR_BSTS, FF_FLOORSPRITE|FF_FULLBRIGHT, 1, {A_TextureAnimate}, 5, 2, S_SNEAKERPANEL_SMALL}, // S_SNEAKERPANEL_SMALL - {SPR_BSTT, FF_FLOORSPRITE|FF_FULLBRIGHT, 1, {A_TextureAnimate}, 5, 2, S_SNEAKERPANEL_TINY}, // S_SNEAKERPANEL_TINY + {SPR_BSTP, FF_ANIMATE|FF_GLOBALANIM|FF_FLOORSPRITE|FF_FULLBRIGHT, -1, {NULL}, 5, 2, S_SNEAKERPANEL}, // S_SNEAKERPANEL + {SPR_BSTS, FF_ANIMATE|FF_GLOBALANIM|FF_FLOORSPRITE|FF_FULLBRIGHT, -1, {NULL}, 5, 2, S_SNEAKERPANEL_SMALL}, // S_SNEAKERPANEL_SMALL + {SPR_BSTT, FF_ANIMATE|FF_GLOBALANIM|FF_FLOORSPRITE|FF_FULLBRIGHT, -1, {NULL}, 5, 2, S_SNEAKERPANEL_TINY}, // S_SNEAKERPANEL_TINY + {SPR_NULL, 0, 65, {A_SpawnSneakerPanel}, 0, 0, S_SNEAKERPANELSPAWNER}, // S_SNEAKERPANELSPAWNER // Various plants {SPR_SBUS, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SONICBUSH @@ -26834,6 +26835,33 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, + { // MT_SNEAKERPANELSPAWNER + 511, // doomednum + S_SNEAKERPANELSPAWNER, // spawnstate + 0, // spawnhealth + S_NULL, // seestate + sfx_None, // seesound + 0, // reactiontime + sfx_None, // attacksound + S_NULL, // painstate + 0, // painchance + sfx_None, // painsound + S_NULL, // meleestate + S_NULL, // missilestate + S_NULL, // deathstate + S_NULL, // xdeathstate + sfx_None, // deathsound + 0, // speed + 32*FRACUNIT, // radius + 60*FRACUNIT, // height + 0, // dispoffset + 0, // mass + 0, // damage + sfx_None, // activesound + MF_NOGRAVITY|MF_NOBLOCKMAP|MF_SCENERY|MF_NOCLIPTHING, // flags + S_NULL // raisestate + }, + { // MT_SONICBUSH, 715, // doomednum S_SONICBUSH, // spawnstate diff --git a/src/info.h b/src/info.h index 5f816accc..75384566e 100644 --- a/src/info.h +++ b/src/info.h @@ -294,7 +294,7 @@ enum actionnum A_INVINCSPARKLEROTATE, A_SPAWNITEMDEBRISCLOUD, A_RINGSHOOTERFACE, - A_TEXTUREANIMATE, + A_SPAWNSNEAKERPANEL, NUMACTIONS }; @@ -569,7 +569,7 @@ void A_FlameShieldPaper(); void A_InvincSparkleRotate(); void A_SpawnItemDebrisCloud(); void A_RingShooterFace(); -void A_TextureAnimate(); +void A_SpawnSneakerPanel(); extern boolean actionsoverridden[NUMACTIONS]; @@ -5394,6 +5394,7 @@ typedef enum state S_SNEAKERPANEL, S_SNEAKERPANEL_SMALL, S_SNEAKERPANEL_TINY, + S_SNEAKERPANELSPAWNER, // Various plants S_SONICBUSH, @@ -6803,6 +6804,7 @@ typedef enum mobj_type // Sneaker Panels MT_SNEAKERPANEL, + MT_SNEAKERPANELSPAWNER, // Various plants MT_SONICBUSH, diff --git a/src/k_objects.h b/src/k_objects.h index f72ad1e20..26f6d14ac 100644 --- a/src/k_objects.h +++ b/src/k_objects.h @@ -194,9 +194,9 @@ void Obj_DashRingPlayerThink(player_t *player); boolean Obj_DashRingPlayerHasNoGravity(player_t *player); /* Sneaker Panels */ +void Obj_SneakerPanelSpriteScale(mobj_t *mobj); void Obj_SneakerPanelSpawn(mobj_t *mobj); void Obj_SneakerPanelSetup(mobj_t *mobj, mapthing_t *mthing); -void Obj_SneakerPanelThink(mobj_t *mobj); void Obj_SneakerPanelCollide(mobj_t *pad, mobj_t *mo); #ifdef __cplusplus diff --git a/src/objects/sneaker-panel.c b/src/objects/sneaker-panel.c index 8d27503a8..aea6aad7b 100644 --- a/src/objects/sneaker-panel.c +++ b/src/objects/sneaker-panel.c @@ -5,7 +5,7 @@ #define SNEAKERPANEL_RADIUS (64*FRACUNIT) -static void SneakerPanelSpriteScale(mobj_t *mobj) +void Obj_SneakerPanelSpriteScale(mobj_t *mobj) { statenum_t newState; fixed_t spriteScale; @@ -41,7 +41,7 @@ static void SneakerPanelSpriteScale(mobj_t *mobj) void Obj_SneakerPanelSpawn(mobj_t *mobj) { mobj->renderflags |= RF_OBJECTSLOPESPLAT | RF_NOSPLATBILLBOARD; - SneakerPanelSpriteScale(mobj); + Obj_SneakerPanelSpriteScale(mobj); } void Obj_SneakerPanelSetup(mobj_t *mobj, mapthing_t *mthing) @@ -52,14 +52,7 @@ void Obj_SneakerPanelSetup(mobj_t *mobj, mapthing_t *mthing) mobj->flags2 |= MF2_OBJECTFLIP; } P_TryMove(mobj, mobj->x, mobj->y, true, NULL); // sets standingslope - SneakerPanelSpriteScale(mobj); -} - -void Obj_SneakerPanelThink(mobj_t *mobj) -{ - // ugh, this only has to exist because of the sneaker panel spawners... - // I think, when we hardcode those, it would be good to make a specialized A_TrapShot wrapper to re-scale their spawned panels and remove this thinker - SneakerPanelSpriteScale(mobj); + Obj_SneakerPanelSpriteScale(mobj); } void Obj_SneakerPanelCollide(mobj_t *panel, mobj_t *mo) diff --git a/src/p_enemy.c b/src/p_enemy.c index 01420801f..a1624f4cf 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -13662,6 +13662,11 @@ A_SpawnItemDebrisCloud (mobj_t *actor) fixed_t kartspeed; fixed_t fade; + if (LUA_CallAction(A_SPAWNITEMDEBRISCLOUD, (actor))) + { + return; + } + if (target == NULL || target->player == NULL) { return; @@ -13735,23 +13740,34 @@ void A_RingShooterFace(mobj_t *actor) Obj_UpdateRingShooterFace(actor); } -// Syncs the actor's frame with the animated texture ticker in P_UpdateSpecials -// Call continuously to simulate an animated texture -// var1 and var2 act like FF_ANIMATE, i.e.: -// var1 = number of additional frames to cycle through -// var2 = number of tics to display each frame -void A_TextureAnimate(mobj_t *actor) +// Function: A_SpawnSneakerPanel +// +// Description: Spawns a sneaker panel object relative to the location of the actor +// +// var1: +// var1 >> 16 = x offset +// var1 & 65535 = y offset +// var2: +// var2 >> 16 = z +// var2 & 65535 = unused +// +void A_SpawnSneakerPanel(mobj_t *actor) { + INT16 x, y, z; + mobj_t *mo; INT32 locvar1 = var1; INT32 locvar2 = var2; - if (LUA_CallAction(A_TEXTUREANIMATE, actor)) + if (LUA_CallAction(A_SPAWNSNEAKERPANEL, actor)) { return; } - if (actor->frame & FF_ANIMATE) // this doesn't work if you're animating on your own as well - return; + x = (INT16)(locvar1 >> 16); + y = (INT16)(locvar1 & 65535); + z = (INT16)(locvar2 >> 16); - actor->frame += ((leveltime / locvar2) % (locvar1 + 1)); + mo = P_SpawnMobjFromMobj(actor, x << FRACBITS, y << FRACBITS, z << FRACBITS, MT_SNEAKERPANEL); + mo->angle = actor->angle; + Obj_SneakerPanelSpriteScale(mo); } diff --git a/src/p_mobj.c b/src/p_mobj.c index 171dbb056..e5addca93 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -128,11 +128,10 @@ static void P_SetupStateAnimation(mobj_t *mobj, state_t *st) if (st->frame & FF_GLOBALANIM) { - // Attempt to account for the pre-ticker for objects spawned on load - if (!leveltime) return; - - mobj->anim_duration -= (leveltime + 2) % st->var2; // Duration synced to timer - mobj->frame += ((leveltime + 2) / st->var2) % (animlength + 1); // Frame synced to timer (duration taken into account) + mobj->anim_duration -= (leveltime % st->var2); // Duration synced to timer + mobj->frame += (leveltime / st->var2) % (animlength + 1); // Frame synced to timer (duration taken into account) + if (!thinkersCompleted) // objects spawned BEFORE (or during) thinkers will think during this tic... + mobj->anim_duration++; // ...so increase the duration of their current frame by 1 to sync with objects spawned AFTER thinkers } else if (st->frame & FF_RANDOMANIM) { @@ -9608,9 +9607,6 @@ static boolean P_MobjRegularThink(mobj_t *mobj) case MT_RAINBOWDASHRING: Obj_RainbowDashRingThink(mobj); break; - case MT_SNEAKERPANEL: - Obj_SneakerPanelThink(mobj); - break; default: // check mobj against possible water content, before movement code P_MobjCheckWater(mobj); diff --git a/src/p_tick.c b/src/p_tick.c index 1c756a8e5..74250931c 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -48,6 +48,7 @@ #endif tic_t leveltime; +boolean thinkersCompleted; INT32 P_AltFlip(INT32 n, tic_t tics) { @@ -685,6 +686,8 @@ void P_Ticker(boolean run) quake_t *quake = NULL; INT32 i; + thinkersCompleted = false; + // Increment jointime and quittime even if paused for (i = 0; i < MAXPLAYERS; i++) { @@ -794,6 +797,7 @@ void P_Ticker(boolean run) ps_thinkertime = I_GetPreciseTime(); P_RunThinkers(); ps_thinkertime = I_GetPreciseTime() - ps_thinkertime; + thinkersCompleted = true; // Run any "after all the other thinkers" stuff { diff --git a/src/p_tick.h b/src/p_tick.h index a17a5358c..d05813c1c 100644 --- a/src/p_tick.h +++ b/src/p_tick.h @@ -25,6 +25,7 @@ extern "C" { #endif extern tic_t leveltime; +extern boolean thinkersCompleted; // Called by G_Ticker. Carries out all thinking of enemies and players. void Command_Numthinkers_f(void); From 6b86cbb500363b21b8321b0877ab426b332647e3 Mon Sep 17 00:00:00 2001 From: Lach Date: Sat, 29 Jul 2023 18:23:04 +1000 Subject: [PATCH 4/4] Fix compile warnings --- src/objects/sneaker-panel.c | 2 +- src/p_enemy.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/objects/sneaker-panel.c b/src/objects/sneaker-panel.c index aea6aad7b..dc5c96c50 100644 --- a/src/objects/sneaker-panel.c +++ b/src/objects/sneaker-panel.c @@ -31,7 +31,7 @@ void Obj_SneakerPanelSpriteScale(mobj_t *mobj) spriteScale = FRACUNIT << 2; } - if ((mobj->state - states) != newState) + if (((statenum_t)(mobj->state - states)) != newState) { P_SetMobjState(mobj, newState); mobj->spritexscale = mobj->spriteyscale = spriteScale; diff --git a/src/p_enemy.c b/src/p_enemy.c index a1624f4cf..2013a19dd 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -330,7 +330,7 @@ void A_FlameShieldPaper(mobj_t *actor); void A_InvincSparkleRotate(mobj_t *actor); void A_SpawnItemDebrisCloud(mobj_t *actor); void A_RingShooterFace(mobj_t *actor); -void A_TextureAnimate(mobj_t *actor); +void A_SpawnSneakerPanel(mobj_t *actor); //for p_enemy.c