Skip to content

Commit

Permalink
game: Fix interactions with bounce pads and push something during fli…
Browse files Browse the repository at this point in the history
…ght status
  • Loading branch information
LegendaryGuard committed Mar 24, 2024
1 parent b795755 commit 691c58a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
3 changes: 3 additions & 0 deletions source/game/bg_misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1083,10 +1083,13 @@ void BG_TouchJumpPad( playerState_t *ps, entityState_t *jumppad ) {
return;
}

// BFP - Flight status can be interacted to bounce pads
#if 0
// flying characters don't hit bounce pads
if ( ps->powerups[PW_FLIGHT] ) {
return;
}
#endif

// if we didn't hit this same jumppad the previous frame
// then don't play the event sound again if we are in a fat trigger
Expand Down
4 changes: 4 additions & 0 deletions source/game/g_trigger.c
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,13 @@ void Use_target_push( gentity_t *self, gentity_t *other, gentity_t *activator )
if ( activator->client->ps.pm_type != PM_NORMAL ) {
return;
}

// BFP - Flight status can be interacted to push something
#if 0
if ( activator->client->ps.powerups[PW_FLIGHT] ) {
return;
}
#endif

VectorCopy (self->s.origin2, activator->client->ps.velocity);

Expand Down

0 comments on commit 691c58a

Please sign in to comment.