thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

P_Ticker: Seperate out local player device rumble handling into its own inlineable function

Browse source 
Clears some space for antigrief handling
This commit is contained in:
toaster 2023-04-13 21:31:18 +01:00
parent b69a575923
commit d4dbc1fe30
1 changed files with 41 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
src/p_tick.c
View file

@ -617,6 +617,37 @@ static inline void P_DoTeamStuff(void)
} }
} }
static inline void P_DeviceRumbleTick(void)
{
UINT8 i;
for (i = 0; i <= splitscreen; i++)
{
player_t *player = &players[g_localplayers[i]];
UINT16 low = 0;
UINT16 high = 0;
if (player->mo == NULL)
continue;
if ((player->mo->eflags & MFE_DAMAGEHITLAG) && player->mo->hitlag)
{
low = high = 65536 / 2;
}
else if (player->sneakertimer > (sneakertime-(TICRATE/2)))
{
low = high = 65536 / (3+player->numsneakers);
}
else if (((player->boostpower < FRACUNIT) || (player->stairjank > 8))
&& P_IsObjectOnGround(player->mo))
{
low = high = 65536 / 32;
}
G_PlayerDeviceRumble(i, low, high);
}
}
void P_RunChaseCameras(void) void P_RunChaseCameras(void)
{ {
UINT8 i; UINT8 i;
@ -767,37 +798,18 @@ void P_Ticker(boolean run)
} }
} }
// Apply rumble to player if local to machine and not in demo playback {
{
}
}
// Apply rumble to local players
if (!demo.playback) if (!demo.playback)
{ {
for (i = 0; i <= splitscreen; i++) P_DeviceRumbleTick();
{
player_t *player = &players[g_localplayers[i]];
UINT16 low = 0;
UINT16 high = 0;
if (player->mo == NULL)
continue;
if ((player->mo->eflags & MFE_DAMAGEHITLAG) && player->mo->hitlag)
{
low = 65536 / 2;
high = 65536 / 2;
}
else if (player->sneakertimer > (sneakertime-(TICRATE/2)))
{
low = 65536 / (3+player->numsneakers);
high = 65536 / (3+player->numsneakers);
}
else if (((player->boostpower < FRACUNIT) || (player->stairjank > 8))
&& P_IsObjectOnGround(player->mo))
{
low = 65536 / 32;
high = 65536 / 32;
}
G_PlayerDeviceRumble(i, low, high);
}
} }
if (numFinishingPlayers > 1) if (numFinishingPlayers > 1)