replace localangle assignments with P_ForceLocalAngle

just a little neater, there also was a function to force the player angle, but this most likely wouldve changed behavior
This commit is contained in:
Alug committed 2025-11-25 22:49:16 +01:00
1 parent 5d71043df6
commit d1a74e3d40
13 files changed
+75 -106

No files matched your search

+3 -1
View File
@@ -2155,7 +2155,7 @@ static void CL_ReloadReceivedSavegame(void)
// we dont have P_ForceLocalAngle so were setting it manually here
for (i = 0; i <= splitscreen; i++)
{
localangle[i] = (angle_t)(players[displayplayers[i]].cmd.angleturn << 16);
P_ForceLocalAngle(&players[displayplayers[i]], (angle_t)(players[displayplayers[i]].cmd.angleturn << 16));
}
for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
@@ -4550,6 +4550,8 @@ static void Got_AddPlayer(const UINT8 **p, INT32 playernum)
DEBFILE("spawning me\n");
}
P_ForceLocalAngle(&players[newplayernum], (angle_t)(players[newplayernum].cmd.angleturn << 16));
D_SendPlayerConfig();
addedtogame = true;
}
+1
View File
@@ -484,6 +484,7 @@ void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
G_CopyTiccmd(cmd, &oldcmd[playernum], 1);
// what in the actual fuck is this???
// SRB2kart: Copy-pasted from ticcmd building, removes that crappy demo cam
if (((players[displayplayers[0]].mo && players[displayplayers[0]].speed > 0) // Moving
|| (leveltime > starttime && (cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE)) // Rubber-burn turn
+1 -1
View File
@@ -160,7 +160,7 @@ typedef enum
const char *G_BuildMapName(INT32 map);
void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer);
// copy ticcmd_t to and fro the normal way
// copy ticcmd_t to and from the normal way
ticcmd_t *G_CopyTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n);
// copy ticcmd_t to and fro network packets
ticcmd_t *G_MoveTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n);
+2 -8
View File
@@ -251,14 +251,8 @@ int mobj_angle_setter(lua_State *L)
mobj_t *mo = GETMO();
mo->angle = luaL_checkangle(L, 2);
for (UINT8 i = 0; i <= splitscreen; i++)
{
if (mo->player == P_GetLocalPlayerForNum(i))
{
localangle[i] = mo->angle;
break;
}
}
if (mo->player)
P_ForceLocalAngle(mo->player, mo->angle);
return 0;
}
+1 -8
View File
@@ -869,14 +869,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
toucher->angle = special->angle;
for (i = 0; i <= splitscreen; i++)
{
if (player == P_GetLocalPlayerForNum(i))
{
localangle[i] = toucher->angle;
break;
}
}
P_ForceLocalAngle(player, toucher->angle);
P_ResetPlayer(player);
+4 -1
View File
@@ -192,6 +192,7 @@ void P_DoPlayerPain(player_t *player, mobj_t *source, mobj_t *inflictor);
void P_ResetPlayer(player_t *player);
player_t *P_GetLocalPlayerForNum(UINT8 pnum);
INT32 P_GetLocalPlayerNumForNum(UINT8 pnum);
INT32 P_GetLocalPlayerNumForPlayer(const player_t *player);
boolean P_IsLocalPlayer(const player_t *player);
boolean P_IsLocalPlayerNum(UINT8 pnum);
boolean P_IsDisplayPlayer(const player_t *player);
@@ -226,7 +227,9 @@ void P_PlayerThink(player_t *player);
void P_PlayerAfterThink(player_t *player);
void P_DoPlayerExit(player_t *player);
void P_DoTimeOver(player_t *player);
//void P_NightserizePlayer(player_t *player, INT32 ptime);
angle_t P_GetLocalAngle(player_t *player);
void P_ForceLocalAngle(player_t *player, angle_t angle);
void P_InstaThrust(mobj_t *mo, angle_t angle, fixed_t move);
fixed_t P_ReturnThrustX(mobj_t *mo, angle_t angle, fixed_t move);
+1 -8
View File
@@ -223,14 +223,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
if (!demo.playback || P_AnalogMove(object->player))
{
for (UINT8 j = 0; j <= splitscreen; ++j)
{
if (object->player == P_GetLocalPlayerForNum(j))
{
localangle[j] = spring->angle;
break;
}
}
P_ForceLocalAngle(object->player, spring->angle);
}
}
+1 -8
View File
@@ -10936,14 +10936,7 @@ void P_AfterPlayerSpawn(INT32 playernum)
mobj->old_z = mobj->z;
mobj->old_angle = mobj->angle;
for (i = 0; i <= splitscreen; i++)
{
if (playernum == P_GetLocalPlayerNumForNum(i))
{
localangle[i] = mobj->angle;
break;
}
}
P_ForceLocalAngle(p, mobj->angle);
p->viewheight = 32<<FRACBITS;
+3 -6
View File
@@ -1383,13 +1383,10 @@ static void Polyobj_rotateThings(polyobj_t *po, vector2_t origin, angle_t delta,
{
mo->angle += delta;
for (UINT8 i = 0; i <= splitscreen; i++)
if (mo->player)
{
if (mo->player == P_GetLocalPlayerForNum(i))
{
localangle[i] += delta;
break;
}
angle_t localangle = P_GetLocalAngle(mo->player);
P_ForceLocalAngle(mo->player, localangle + delta);
}
}
}
-10
View File
@@ -2107,16 +2107,6 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
i = READUINT8(save->p);
mobj->player = &players[i];
mobj->player->mo = mobj;
// added for angle prediction
if (consoleplayer == i)
localangle[0] = mobj->angle;
else if (displayplayers[1] == i)
localangle[1] = mobj->angle;
else if (displayplayers[2] == i)
localangle[2] = mobj->angle;
else if (displayplayers[3] == i)
localangle[3] = mobj->angle;
}
if (diff & MD_MOVEDIR)
mobj->movedir = READANGLE(save->p);
+7 -20
View File
@@ -3559,14 +3559,7 @@ DoneSection2:
if (!demo.playback || P_AnalogMove(player))
{
for (UINT8 j = 0; j <= splitscreen; ++j)
{
if (player == P_GetLocalPlayerForNum(j))
{
localangle[j] = player->mo->angle;
break;
}
}
P_ForceLocalAngle(player, player->mo->angle);
}
if (!(lines[i].flags & ML_EFFECT4))
@@ -7518,22 +7511,16 @@ void T_Pusher(pusher_t *p)
thing->player->pflags |= PF_JUMPED;
thing->player->pflags |= PF_SLIDING;
thing->angle = R_PointToAngle2 (0, 0, xspeed<<(FRACBITS-PUSH_FACTOR), yspeed<<(FRACBITS-PUSH_FACTOR));
thing->angle = R_PointToAngle2(0, 0, xspeed<<(FRACBITS-PUSH_FACTOR), yspeed<<(FRACBITS-PUSH_FACTOR));
if (!demo.playback || P_AnalogMove(thing->player))
{
for (UINT8 i = 0; i <= splitscreen; ++i)
{
if (thing->player == P_GetLocalPlayerForNum(i))
{
if (thing->angle - localangle[i] > ANGLE_180)
localangle[i] -= (localangle[i] - thing->angle) / 8;
else
localangle[i] += (thing->angle - localangle[i]) / 8;
angle_t angle = P_GetLocalAngle(thing->player);
break;
}
}
if (thing->angle - angle > ANGLE_180)
P_ForceLocalAngle(thing->player, angle - (angle - thing->angle) / 8);
else
P_ForceLocalAngle(thing->player, angle + (thing->angle - angle) / 8);
}
}
+3 -10
View File
@@ -65,14 +65,7 @@ void P_MixUp(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle,
thing->reactiontime = TICRATE/2; // don't move for about half a second
// absolute angle position
for (i = 0; i <= splitscreen; i++)
{
if (thing == P_GetLocalPlayerForNum(i)->mo)
{
localangle[i] = angle;
break;
}
}
P_ForceLocalAngle(thing->player, angle);
// move chasecam at new player location
for (i = 0; i <= splitscreen; i++)
@@ -151,18 +144,18 @@ boolean P_Teleport(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle
thing->reactiontime = TICRATE/2; // don't move for about half a second
// absolute angle position
P_ForceLocalAngle(thing->player, angle);
// move chasecam at new player location
for (i = 0; i <= splitscreen; i++)
{
if (thing->player != &players[displayplayers[i]])
continue;
localangle[i] = angle;
if (camera[i].chase)
P_ResetCamera(thing->player, &camera[i]);
R_ResetViewInterpolation(i + 1);
break;
}
// don't run in place after a teleport
+48 -25
View File
@@ -996,6 +996,19 @@ INT32 P_GetLocalPlayerNumForNum(UINT8 pnum)
return (pnum == 0 ? consoleplayer : displayplayers[pnum]);
}
INT32 P_GetLocalPlayerNumForPlayer(const player_t *player)
{
for (UINT8 i = 0; i <= splitscreen; i++)
{
if (player == P_GetLocalPlayerForNum(i))
{
return i;
}
}
return -1;
}
//
// P_IsLocalPlayer
//
@@ -2603,15 +2616,7 @@ static void P_DoZoomTube(player_t *player)
if (player->mo->tracer)
{
player->mo->angle = R_PointToAngle2(player->mo->x, player->mo->y, player->mo->tracer->x, player->mo->tracer->y);
for (UINT8 i = 0; i <= splitscreen; i++)
{
if (player == P_GetLocalPlayerForNum(i))
{
localangle[i] = player->mo->angle;
break;
}
}
P_ForceLocalAngle(player, player->mo->angle);
}
}
@@ -2797,14 +2802,7 @@ void P_HomingAttack(mobj_t *source, mobj_t *enemy) // Home in on your target
if (source->player)
{
for (UINT8 i = 0; i <= splitscreen; i++)
{
if (source->player == P_GetLocalPlayerForNum(i))
{
localangle[i] = source->angle;
break;
}
}
P_ForceLocalAngle(source->player, source->angle);
}
// change slope
@@ -5200,14 +5198,8 @@ void P_PlayerAfterThink(player_t *player)
player->mo->tracer->target->health += cmd->sidemove;
player->mo->angle += cmd->sidemove << ANGLETOFINESHIFT; // 2048 --> ANGLE_MAX
for (i = 0; i <= splitscreen; i++)
{
if (player == P_GetLocalPlayerForNum(i))
{
localangle[i] = player->mo->angle; // Adjust the local control angle.
break;
}
}
// Adjust the local control angle.
P_ForceLocalAngle(player, player->mo->angle);
}
}
@@ -5246,3 +5238,34 @@ void P_PlayerAfterThink(player_t *player)
K_KartPlayerAfterThink(player);
}
angle_t P_GetLocalAngle(player_t *player)
{
// this function is from vanilla srb2. can you tell?
// (hint: they have separate variables for all of this shit instead of arrays)
UINT8 i;
for (i = 0; i <= splitscreen; i++)
{
if (player == &players[displayplayers[i]])
return localangle[i];
}
return 0;
}
void P_ForceLocalAngle(player_t *player, angle_t angle)
{
UINT8 i;
angle = angle & ~UINT16_MAX;
for (i = 0; i <= splitscreen; i++)
{
if (player == &players[displayplayers[i]])
{
localangle[i] = angle;
}
}
}