From 61e0f4e1420243a2e177002500e0fde022df91d3 Mon Sep 17 00:00:00 2001 From: NepDisk <16447892+NepDisk@users.noreply.github.com> Date: Mon, 29 Jul 2024 03:45:38 -0400 Subject: [PATCH] Remove tiregrease. --- src/d_player.h | 1 - src/deh_tables.c | 3 --- src/info.c | 29 -------------------------- src/info.h | 3 --- src/k_bot.c | 2 +- src/k_kart.c | 43 +------------------------------------- src/lua_playerlib.c | 4 ---- src/p_map.c | 19 ----------------- src/p_mobj.c | 50 --------------------------------------------- src/p_saveg.c | 2 -- 10 files changed, 2 insertions(+), 154 deletions(-) diff --git a/src/d_player.h b/src/d_player.h index ce17f542d..f1f849d59 100644 --- a/src/d_player.h +++ b/src/d_player.h @@ -429,7 +429,6 @@ typedef struct player_s fixed_t offroad; // In Super Mario Kart, going offroad has lee-way of about 1 second before you start losing speed UINT8 waterskip; // Water skipping counter - UINT16 tiregrease; // Reduced friction timer after hitting a spring UINT16 springstars; // Spawn stars around a player when they hit a spring UINT16 springcolor; // Color of spring stars UINT8 dashpadcooldown; // Separate the vanilla SA-style dash pads from using flashing diff --git a/src/deh_tables.c b/src/deh_tables.c index 7611f0bdd..0ed2a79df 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -4417,8 +4417,6 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi "S_DRAFTDUST4", "S_DRAFTDUST5", - "S_TIREGREASE", - "S_OVERTIME_BULB1", "S_OVERTIME_BULB2", "S_OVERTIME_LASER", @@ -5553,7 +5551,6 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t "MT_GAINAX", "MT_DRAFTDUST", "MT_SPBDUST", - "MT_TIREGREASE", "MT_OVERTIME_PARTICLE", "MT_OVERTIME_CENTER", diff --git a/src/info.c b/src/info.c index 5ce5b0c2f..bcbfb6b04 100644 --- a/src/info.c +++ b/src/info.c @@ -5003,8 +5003,6 @@ state_t states[NUMSTATES] = {SPR_DRAF, 3, 1, {NULL}, 0, 0, S_DRAFTDUST5}, // S_DRAFTDUST4 {SPR_DRAF, 4, 1, {NULL}, 0, 0, S_NULL}, // S_DRAFTDUST5 - {SPR_GRES, FF_ANIMATE|FF_PAPERSPRITE, -1, {NULL}, 2, 4, S_NULL}, // S_TIREGREASE - {SPR_OTBU, FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_NULL}, // S_OVERTIME_BULB1 {SPR_OTBU, FF_FULLBRIGHT|2, 1, {NULL}, 0, 0, S_NULL}, // S_OVERTIME_BULB2 {SPR_OTLS, FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_NULL}, // S_OVERTIME_LASER @@ -28379,33 +28377,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - { // MT_TIREGREASE - -1, // doomednum - S_TIREGREASE, // spawnstate - 1000, // spawnhealth - S_NULL, // seestate - sfx_None, // seesound - 8, // 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 - 8<mo->angle, K_MomentumAngle(player->mo)); - if (player->spindashboost || player->tiregrease // You just released a spindash, you don't need to try again yet, jeez. + if (player->spindashboost // You just released a spindash, you don't need to try again yet, jeez. || P_PlayerInPain(player) || !P_IsObjectOnGround(player->mo)) // Not in a state where we want 'em to spindash. { player->botvars.spindashconfirm = 0; diff --git a/src/k_kart.c b/src/k_kart.c index d835fafc0..f1df37332 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -1592,10 +1592,6 @@ static UINT8 K_CheckOffroadCollide(mobj_t *mo) I_Assert(mo != NULL); I_Assert(!P_MobjWasRemoved(mo)); - // If tiregrease is active, don't - if (mo->player && mo->player->tiregrease) - return 0; - for (node = mo->touching_sectorlist; node; node = node->m_sectorlist_next) { if (!node->m_sector) @@ -2955,7 +2951,7 @@ boolean K_ApplyOffroad(player_t *player) boolean K_SlopeResistance(player_t *player) { - if (player->invincibilitytimer || player->sneakertimer || player->tiregrease || player->flamedash) + if (player->invincibilitytimer || player->sneakertimer || player->flamedash) return true; return false; } @@ -2993,7 +2989,6 @@ boolean K_WaterRun(player_t *player) if ( player->invincibilitytimer || player->sneakertimer || - player->tiregrease || player->flamedash || player->speed > 2 * K_GetKartSpeed(player, false, true) ) @@ -7391,9 +7386,6 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) if (player->justbumped > 0) player->justbumped--; - if (player->tiregrease) - player->tiregrease--; - K_UpdateTripwire(player); K_KartPlayerHUDUpdate(player); @@ -8127,18 +8119,6 @@ static INT16 K_GetKartDriftValue(player_t *player, fixed_t countersteer) basedrift = (83 * player->drift) - (((driftweight - 14) * player->drift) / 5); // 415 - 303 driftadjust = abs((252 - driftweight) * player->drift / 5); - if (player->tiregrease > 0) // Buff drift-steering while in greasemode - { - basedrift += (basedrift / greasetics) * player->tiregrease; - } - -#if 0 - if (player->mo->eflags & MFE_UNDERWATER) - { - countersteer = FixedMul(countersteer, 3*FRACUNIT/2); - } -#endif - return basedrift + (FixedMul(driftadjust * FRACUNIT, countersteer) / FRACUNIT); } @@ -9032,21 +9012,6 @@ static void K_KartSpindash(player_t *player) P_InstaThrust(player->mo, player->mo->angle, thrust); } - if (!player->tiregrease) - { - UINT8 i; - for (i = 0; i < 2; i++) - { - mobj_t *grease; - grease = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_TIREGREASE); - P_SetTarget(&grease->target, player->mo); - P_InitAngle(grease, K_MomentumAngle(player->mo)); - grease->extravalue1 = i; - } - } - - player->tiregrease = 2*TICRATE; - player->spindash = 0; S_StartSound(player->mo, sfx_s23c); } @@ -9212,12 +9177,6 @@ void K_AdjustPlayerFriction(player_t *player) return; } - // Reduce friction after hitting a spring - if (player->tiregrease) - { - player->mo->friction += ((FRACUNIT - prevfriction) / greasetics) * player->tiregrease; - } - /* if (K_PlayerEBrake(player) == true) { diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c index 4324989a9..473b54dc3 100644 --- a/src/lua_playerlib.c +++ b/src/lua_playerlib.c @@ -256,8 +256,6 @@ static int player_get(lua_State *L) lua_pushinteger(L, plr->offroad); else if (fastcmp(field,"waterskip")) lua_pushinteger(L, plr->waterskip); - else if (fastcmp(field,"tiregrease")) - lua_pushinteger(L, plr->tiregrease); else if (fastcmp(field,"springstars")) lua_pushinteger(L, plr->springstars); else if (fastcmp(field,"springcolor")) @@ -612,8 +610,6 @@ static int player_set(lua_State *L) plr->offroad = luaL_checkinteger(L, 3); else if (fastcmp(field,"waterskip")) plr->waterskip = luaL_checkinteger(L, 3); - else if (fastcmp(field,"tiregrease")) - plr->tiregrease = luaL_checkinteger(L, 3); else if (fastcmp(field,"springstars")) plr->springstars = luaL_checkinteger(L, 3); else if (fastcmp(field,"springcolor")) diff --git a/src/p_map.c b/src/p_map.c index 28f96a772..b088d28e2 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -422,25 +422,6 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object) object->player->springstars = max(vertispeed, horizspeed) / FRACUNIT / 2; object->player->springcolor = starcolor; - // Less friction when hitting springs - if (!object->player->tiregrease) - { - UINT8 i; - for (i = 0; i < 2; i++) - { - mobj_t *grease; - grease = P_SpawnMobj(object->x, object->y, object->z, MT_TIREGREASE); - P_SetTarget(&grease->target, object); - P_InitAngle(grease, K_MomentumAngle(object)); - grease->extravalue1 = i; - } - } - - if (object->player->tiregrease < greasetics) - { - object->player->tiregrease = greasetics; - } - if (spring->type == MT_POGOSPRING) { if (spring->reactiontime == 0) diff --git a/src/p_mobj.c b/src/p_mobj.c index e749aa843..e781ae992 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -7522,56 +7522,6 @@ static boolean P_MobjRegularThink(mobj_t *mobj) mobj->angle = mobj->target->angle + ANGLE_45; } break; - case MT_TIREGREASE: - if (!mobj->target || P_MobjWasRemoved(mobj->target) || !mobj->target->player - || !mobj->target->player->tiregrease) - { - P_RemoveMobj(mobj); - return false; - } - - K_MatchGenericExtraFlags(mobj, mobj->target); - - { - const angle_t off = FixedAngle(40*FRACUNIT); - angle_t ang = K_MomentumAngle(mobj->target); - fixed_t z; - UINT8 trans = (mobj->target->player->tiregrease * (NUMTRANSMAPS+1)) / greasetics; - - if (trans > NUMTRANSMAPS) - trans = NUMTRANSMAPS; - - trans = NUMTRANSMAPS - trans; - - z = mobj->target->z; - if (mobj->eflags & MFE_VERTICALFLIP) - z += mobj->target->height; - - if (mobj->extravalue1) - ang = (signed)(ang - off); - else - ang = (signed)(ang + off); - - P_MoveOrigin(mobj, - mobj->target->x - FixedMul(mobj->target->radius, FINECOSINE(ang >> ANGLETOFINESHIFT)), - mobj->target->y - FixedMul(mobj->target->radius, FINESINE(ang >> ANGLETOFINESHIFT)), - z); - mobj->angle = ang; - - if (!P_IsObjectOnGround(mobj->target)) - mobj->renderflags |= RF_DONTDRAW; - - if (leveltime & 1) - mobj->renderflags |= RF_DONTDRAW; - - if (trans >= NUMTRANSMAPS) - mobj->renderflags |= RF_DONTDRAW; - else if (trans == 0) - mobj->renderflags = (mobj->renderflags & ~RF_TRANSMASK); - else - mobj->renderflags = (mobj->renderflags & ~RF_TRANSMASK)|(trans << RF_TRANSSHIFT); - } - break; case MT_LIGHTNINGSHIELD: { fixed_t destx, desty; diff --git a/src/p_saveg.c b/src/p_saveg.c index 9d1be6116..de1506a9e 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -269,7 +269,6 @@ static void P_NetArchivePlayers(void) WRITEFIXED(save_p, players[i].offroad); WRITEUINT8(save_p, players[i].waterskip); - WRITEUINT16(save_p, players[i].tiregrease); WRITEUINT16(save_p, players[i].springstars); WRITEUINT16(save_p, players[i].springcolor); WRITEUINT8(save_p, players[i].dashpadcooldown); @@ -552,7 +551,6 @@ static void P_NetUnArchivePlayers(void) players[i].offroad = READFIXED(save_p); players[i].waterskip = READUINT8(save_p); - players[i].tiregrease = READUINT16(save_p); players[i].springstars = READUINT16(save_p); players[i].springcolor = READUINT16(save_p); players[i].dashpadcooldown = READUINT8(save_p);