Skip to content
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

Jump to bottom

Fixed some warnings #1116

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

Fixed some warnings #1116

wants to merge 1 commit into from

Conversation

The-New-Order
Copy link

No description provided.

ikopysov
ikopysov reviewed May 11, 2022
View reviewed changes
code/game/g_active.cpp
@@ -2904,8 +2904,8 @@ qboolean G_CheckClampUcmd( gentity_t *ent, usercmd_t *ucmd )
damage = Q_irand( 3, 5 );
}
}
if ( ent->client->ps.legsAnimTimer <= 1150
&& ent->client->ps.legsAnimTimer > 10500 )
if ( ent->client->ps.legsAnimTimer > 1150
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems this conflicts with #1119. I'm not sure which one is correct

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you look at the other checks in the same function you will see that most are checking for a 100ms time window such as:

if ( ent->client->ps.legsAnimTimer <= 3150
    && ent->client->ps.legsAnimTimer > 3050 )

or

if ( ent->client->ps.legsAnimTimer <= 5700
    && ent->client->ps.legsAnimTimer > 5600 )

which is why I assumed mine would be the logical fix here. I could also be wrong though.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I'm concerned, @tobhe 's one is correct

bartrpe
bartrpe approved these changes Oct 8, 2023
View reviewed changes
Copy link

@bartrpe bartrpe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixes obvious typos in the code that messes up stuff. I think it should be merged, it's relatively straightforward

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tobhe tobhe tobhe left review comments

@ikopysov ikopysov ikopysov left review comments

@bartrpe bartrpe bartrpe approved these changes

At least 2 approving reviews are required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@The-New-Order @tobhe @bartrpe @ikopysov