Skip to content

pm: scout: fix conc + dash during prematch #1246

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

Merged
merged 1 commit into from
Oct 13, 2023
Merged

pm: scout: fix conc + dash during prematch #1246

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
3 changes: 3 additions & 0 deletions csqc/weapon_predict.qc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,6 +909,9 @@ float PM_Enabled();
void PM_AddNudgeDash(float cseq);

static void WP_Special() {
if (prematch)
return;

if (pstate_pred.server_time < pstate_pred.special_next)
return;

Expand Down
4 changes: 4 additions & 0 deletions share/classes.qc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,10 @@ static inline void ConcAction(entity ent, float itime, float mag, float flip) {
#endif

void Conc_Update(ConcState *cs, entity ent, float ctime) {
#ifdef SSQC
if (ent.invincible_finished > time) // TODO: Is this worth sharing?
cs->mag = 0;
#endif
if (!cs->mag || ctime < cs->next)
return;

Expand Down