incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

the safeguardist of safeguards

Browse source
This commit is contained in:
NepDisk 2025-05-15 11:38:43 -04:00
parent 5b8f200e1a
commit 08408831bf
4 changed files with 102 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/d_player.h
View file

@ -602,8 +602,9 @@ struct player_t
UINT8 startboost; // (0 to 125) - Boost you get from start of race or respawn drop dash
// Respawn
UINT8 dropdash;
UINT8 respawn;
UINT8 dropdash; // Gain a burst of speed when you drop while respawning
UINT8 respawn; // Timer given when you die.
UINT8 softlocktimer; // Tracks how fast you died after respawning. Use for softlock prevention.
UINT16 flashing;
UINT16 spinouttimer; // Spin-out from a banana peel or oil slick (was "pw_bananacam")

106
src/k_kart.c
View file

@ -2616,6 +2616,7 @@ static void K_RespawnChecker(player_t *player)
player->mo->colorized = false;
player->dropdash = 0;
player->respawn = 0;
player->softlocktimer = 3*TICRATE;
}
}
}
@ -7550,6 +7551,9 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
if (player->checkskip)
player->checkskip--;
if (player->softlocktimer)
player->softlocktimer--;
if (player->bigwaypointgap && (player->bigwaypointgap > AUTORESPAWN_THRESHOLD || !P_PlayerInPain(player)))
{
player->bigwaypointgap--;
@ -8730,15 +8734,19 @@ static void K_FudgeRespawn(player_t *player, const waypoint_t *const waypoint)
void K_SetRespawnAtNextWaypoint(player_t * player)
{
mobj_t *currentwaypoint = NULL;
mobj_t *safewaypoint = NULL;
waypoint_t *currentwaypoint = NULL;
waypoint_t *safewaypoint = NULL;
angle_t respawnangle;
size_t i;
if (K_UsingLegacyCheckpoints())
{
// Woah what are you doing...
return;
}
if ((player != NULL) && (player->mo != NULL) && (P_MobjWasRemoved(player->mo) == false))
{
// Safety :P
if (!player->currentwaypoint || !player->nextwaypoint)
{
@ -8771,30 +8779,70 @@ void K_SetRespawnAtNextWaypoint(player_t * player)
continue;
}
if (!K_GetWaypointIsFinishline(oopisepoint->nextwaypoints[i]))
{
// Please don't spawn on the other side of the map please.
continue;
}
if (!oopisepoint->nextwaypoints[i]->mobj)
{
// No mobj? No Dice.
continue;
}
safewaypoint = oopisepoint->nextwaypoints[i]->mobj;
if (!K_SafeRespawnPosition(oopisepoint->nextwaypoints[i]->mobj))
{
// This waypoint is not safe.
continue;
}
if (K_GetWaypointIsFinishline(oopisepoint->nextwaypoints[i]))
{
// Please don't spawn over the line.
currentwaypoint = oopisepoint->nextwaypoints[i];
break;
}
safewaypoint = oopisepoint->nextwaypoints[i];
break;
}
}
currentwaypoint = player->mo;
if ((oopisepoint->prevwaypoints != NULL) && (oopisepoint->numprevwaypoints > 0))
{
for (i = 0; i < oopisepoint->numprevwaypoints; i++)
{
if (!K_GetWaypointIsEnabled(oopisepoint->prevwaypoints[i]))
{
// Waypoint is not enabled.
continue;
}
if (K_GetWaypointIsShortcut(oopisepoint->prevwaypoints[i]))
{
// Respawning into offroad/tripwire path would suck.
continue;
}
if (!K_GetWaypointIsSpawnpoint(oopisepoint->prevwaypoints[i]))
{
// We can't spawn at these anyway.
continue;
}
if (!oopisepoint->prevwaypoints[i]->mobj)
{
// No mobj? No Dice.
continue;
}
currentwaypoint = oopisepoint->prevwaypoints[i];
break;
}
}
CONS_Debug(DBG_GAMELOGIC, M_GetText("Tried to respawn at invalid waypoint! Setting respawn to closest waypoint\n"));
}
else
{
currentwaypoint = player->currentwaypoint->mobj;
safewaypoint = player->nextwaypoint->mobj;
currentwaypoint = player->currentwaypoint;
safewaypoint = player->nextwaypoint;
}
// Better safe then sorry.
@ -8805,17 +8853,39 @@ void K_SetRespawnAtNextWaypoint(player_t * player)
return;
}
respawnangle = R_PointToAngle2(currentwaypoint->x, currentwaypoint->y, safewaypoint->x, safewaypoint->y);
if (!currentwaypoint)
{
respawnangle = R_PointToAngle2(player->mo->x, player->mo->y, safewaypoint->mobj->x, safewaypoint->mobj->y);
}
else
{
respawnangle = R_PointToAngle2(currentwaypoint->mobj->x, currentwaypoint->mobj->y, safewaypoint->mobj->x, safewaypoint->mobj->y);
}
if (K_GetWaypointIsFinishline(safewaypoint))
{
// Please don't spawn after the line.
player->pflags |= PF_TRUSTWAYPOINTS;
player->starposttime = player->realtime;
player->starpostz = currentwaypoint->mobj->z >> FRACBITS;
player->starpostflip = (currentwaypoint->mobj->flags2 & MF2_OBJECTFLIP);
player->starpostangle = player->mo->angle;
// Then do x and y
player->starpostx = currentwaypoint->mobj->x >> FRACBITS;
player->starposty = currentwaypoint->mobj->y >> FRACBITS;
return;
}
player->pflags |= PF_TRUSTWAYPOINTS;
player->starposttime = player->realtime;
player->starpostz = (safewaypoint->spawnpoint->z + 15) >> FRACBITS;
player->starpostflip = (safewaypoint->flags2 & MF2_OBJECTFLIP);
player->starpostz = safewaypoint->mobj->z >> FRACBITS;
player->starpostflip = (safewaypoint->mobj->flags2 & MF2_OBJECTFLIP);
player->starpostangle = respawnangle;
// Then do x and y
player->starpostx = safewaypoint->x >> FRACBITS;
player->starposty = safewaypoint->y >> FRACBITS;
player->starpostx = safewaypoint->mobj->x >> FRACBITS;
player->starposty = safewaypoint->mobj->y >> FRACBITS;
}
else
{

8
src/p_saveg.c
View file

@ -244,6 +244,10 @@ static void P_NetArchivePlayers(savebuffer_t *save)
WRITEUINT32(save->p, players[i].airtime);
WRITEUINT8(save->p, players[i].startboost);
WRITEUINT8(save->p, players[i].dropdash);
WRITEUINT8(save->p, players[i].respawn);
WRITEUINT8(save->p, players[i].softlocktimer);
WRITEUINT16(save->p, players[i].flashing);
WRITEUINT16(save->p, players[i].spinouttimer);
WRITEUINT8(save->p, players[i].spinouttype);
@ -567,6 +571,10 @@ static void P_NetUnArchivePlayers(savebuffer_t *save)
players[i].airtime = READUINT32(save->p);
players[i].startboost = READUINT8(save->p);
players[i].dropdash = READUINT8(save->p);
players[i].respawn = READUINT8(save->p);
players[i].softlocktimer = READUINT8(save->p);
players[i].flashing = READUINT16(save->p);
players[i].spinouttimer = READUINT16(save->p);
players[i].spinouttype = READUINT8(save->p);

6
src/p_user.c
View file

@ -2504,9 +2504,9 @@ static void P_DeathThink(player_t *player)
else
player->karthud[khud_timeovercam] = 0;
// Set players next respawn point to the next waypoint
// If they die while still in respawn state for extra safety.
if (player->nextwaypoint && player->respawn > 0)
// If the player dies too fast or dies during respawn...
// Set players next respawn point to the next waypoint for extra safety.
if (player->softlocktimer > 0 || player->respawn > 0)
{
// Now a clean function! Neat, eh?
K_SetRespawnAtNextWaypoint(player);