Skip to content

fix: shotgun not applying knockback on frag (v2) #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WofWca wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: shotgun not applying knockback on frag (v2) #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions code/game/g_active.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1154,6 +1154,12 @@ void ClientEndFrame( gentity_t *ent ) {

client->ps.stats[STAT_HEALTH] = ent->health; // FIXME: get rid of ent->health...

// This is not present in the original game code,
// see comments about `FL_NO_KNOCKBACK` in `g_combat`.
if ( client->ps.pm_type & PM_DEAD ) {
ent->flags |= FL_NO_KNOCKBACK;
}

G_SetClientSound( ent );

// set the latest info
Expand Down
26 changes: 24 additions & 2 deletions code/game/g_combat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1064,8 +1064,30 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
}

if ( targ->health <= 0 ) {
if ( client )
targ->flags |= FL_NO_KNOCKBACK;
// In the original code we used to set `FL_NO_KNOCKBACK` here.
// However, that made it so that when fragging with the shotgun,
// the dead body does not gain momentum (knockback)
// from the pellets that come after the pellet
// that made the health go below 0.
// That resulted in the dead body not getting pushed
// as far as it should have been, and, most importantly,
// the gibs not getting enough momentum. See
// https://github.com/ec-/baseq3a/pull/53.
//
// Now we set the `FL_NO_KNOCKBACK` flag inside of `ClientEndFrame`,
// which is ran after all the pellets of the shotgun shot
// have done their thing,
// i.e. `FL_NO_KNOCKBACK` takes effect only on the next frame.
//
// Note that if the body gets gibbed then
// it will still stop absorbing pellets,
// i.e. this fix only adds at most `GIB_HEALTH` worth of knockback.
//
// This issiue is similar to
// https://github.com/ioquake/ioq3/issues/794.
//
// if ( client )
// targ->flags |= FL_NO_KNOCKBACK;

if (targ->health < -999)
targ->health = -999;
Expand Down