thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-02 14:12:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Finalize Bungee hardcode

Browse source
This commit is contained in:
Lat 2023-09-20 15:03:45 +02:00
parent 85a103e743
commit 9b432381c6
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/k_kart.c
View file

@ -11845,7 +11845,9 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
} }
Obj_RingShooterInput(player); Obj_RingShooterInput(player);
Obj_playerBungeeThink(player);
if (player->bungee)
Obj_playerBungeeThink(player);
} }
void K_CheckSpectateStatus(boolean considermapreset) void K_CheckSpectateStatus(boolean considermapreset)

7
src/objects/bungee.c
View file

@ -49,8 +49,6 @@ void Obj_BungeeSpecial(mobj_t *mo, player_t *p)
S_StartSound(mo, sfx_s3k5a); S_StartSound(mo, sfx_s3k5a);
P_SetTarget(&p->mo->tracer, latch); P_SetTarget(&p->mo->tracer, latch);
return;
} }
// this is the thinker to call on the player when they get bungee'd. // this is the thinker to call on the player when they get bungee'd.
@ -61,7 +59,7 @@ void Obj_playerBungeeThink(player_t *p)
UINT8 i; UINT8 i;
// someone removed it // someone removed it
if (!bungee || !P_MobjWasRemoved(bungee)) if (!bungee || P_MobjWasRemoved(bungee))
return; return;
bungee->tics = 4; // we set this to a low value so that it despawns if the player vanishes for some reason. bungee->tics = 4; // we set this to a low value so that it despawns if the player vanishes for some reason.
@ -90,7 +88,7 @@ void Obj_playerBungeeThink(player_t *p)
p->mo->flags &= ~MF_NOGRAVITY; p->mo->flags &= ~MF_NOGRAVITY;
p->mo->flags &= ~MF_NOCLIPTHING; p->mo->flags &= ~MF_NOCLIPTHING;
p->mo->pflags &= ~PF_NOFASTFALL; p->pflags &= ~PF_NOFASTFALL;
p->bungee = BUNGEE_NONE; p->bungee = BUNGEE_NONE;
P_InstaThrust(p->mo, bungee->angle, p->mo->momz/8); P_InstaThrust(p->mo, bungee->angle, p->mo->momz/8);
p->mo->momz = (p->mo->momz*3)/4; p->mo->momz = (p->mo->momz*3)/4;
@ -115,6 +113,7 @@ void Obj_playerBungeeThink(player_t *p)
P_SetScale(seg, mapobjectscale/3); P_SetScale(seg, mapobjectscale/3);
seg->color = SKINCOLOR_EMERALD; seg->color = SKINCOLOR_EMERALD;
seg->frame = 0;
seg->fuse = 2; seg->fuse = 2;
} }
} }