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

Add Spring force angle flag for UDMF

Browse source
This commit is contained in:
NepDisk 2025-12-02 18:16:26 -05:00
parent a8e14a6adb
commit 071478a6b9
3 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/p_map.c
View file

@ -254,6 +254,36 @@ static boolean P_SpecialIsLinedefCrossType(line_t *ld)
return linedefcrossspecial;
}
static boolean P_ShouldSpringForceAngle(mobj_t *spring, ticcmd_t *cmd)
{
switch (spring->type)
{
case MT_YELLOWDIAG:
case MT_REDDIAG:
case MT_BLUEDIAG:
case MT_GRAYDIAG:
if (spring->args[0] & TMSPR_FORCEANGLE)
return true;
break;
case MT_YELLOWHORIZ:
case MT_REDHORIZ:
case MT_BLUEHORIZ:
case MT_GRAYHORIZ:
if (spring->args[1] & TMSPR_FORCEANGLE)
return true;
break;
default:
break;
}
// Not forced or a irregular spring?
// Always allow players that release accel to adjust angle.
if (cmd->forwardmove == 0 && cmd->sidemove == 0)
return true;
return false;
}
void
P_DoSpringEx
( mobj_t * object,
@ -388,7 +418,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
{
if (spring->flags & MF_ENEMY) // Spring shells
P_SetTarget(&spring->target, object);
if (horizspeed && object->player->cmd.forwardmove == 0 && object->player->cmd.sidemove == 0)
if (horizspeed && P_ShouldSpringForceAngle(spring, &object->player->cmd))
{
object->angle = spring->angle;
object->player->angleturn = spring->angle;

1
src/p_mobj.c
View file

@ -12651,6 +12651,7 @@ fixed_t P_GetMapThingSpawnHeight(const mobjtype_t mobjtype, const mapthing_t* mt
case MT_YELLOWHORIZ:
case MT_REDHORIZ:
case MT_BLUEHORIZ:
case MT_GRAYHORIZ:
offset += mthing->args[0] ? 0 : 16*FRACUNIT;
break;

1
src/p_spec.h
View file

@ -120,6 +120,7 @@ typedef enum
{
TMSPR_NOGRAVITY = 1,
TMSPR_ROTATEEXTRA = 1<<1,
TMSPR_FORCEANGLE = 1<<2,
} textmapspringflags_t;
typedef enum