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

Merge branch 'horncode-dx' into 'master'

Browse source 
Sounds on display

See merge request KartKrew/Kart!1343
This commit is contained in:
toaster 2023-07-19 14:18:23 +00:00
commit 6d1fe69c15
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_follower.c
View file

@ -722,7 +722,7 @@ void K_FollowerHornTaunt(player_t *taunter, player_t *victim)
|| victim == NULL || victim == NULL
|| taunter->followerskin < 0 || taunter->followerskin < 0
|| taunter->followerskin >= numfollowers || taunter->followerskin >= numfollowers
|| (P_IsLocalPlayer(victim) == false && cv_karthorns.value != 2) || (P_IsDisplayPlayer(victim) == false && cv_karthorns.value != 2)
|| P_MobjWasRemoved(taunter->mo) == true || P_MobjWasRemoved(taunter->mo) == true
|| P_MobjWasRemoved(taunter->follower) == true || P_MobjWasRemoved(taunter->follower) == true
) )

2
src/p_user.c
View file

@ -4302,7 +4302,7 @@ void P_PlayerThink(player_t *player)
else if (player->kickstartaccel < ACCEL_KICKSTART) else if (player->kickstartaccel < ACCEL_KICKSTART)
{ {
player->kickstartaccel++; player->kickstartaccel++;
if ((player->kickstartaccel == ACCEL_KICKSTART) && P_IsLocalPlayer(player)) if ((player->kickstartaccel == ACCEL_KICKSTART) && !K_PlayerUsesBotMovement(player) && P_IsDisplayPlayer(player))
{ {
S_StartSound(NULL, sfx_ding); S_StartSound(NULL, sfx_ding);
} }