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

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Expand Up @@ -286,6 +286,7 @@ elseif (("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_C_COMPILER_ID}" M
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-comment")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-offsetof")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-non-c-typedef-for-linkage")
endif()
else()
message(ERROR "Unsupported compiler")
Expand Down
6 changes: 3 additions & 3 deletions code/game/bg_pmove.cpp
View file
Open in desktop
Expand Up @@ -10998,9 +10998,9 @@ saberMoveName_t G_PickAutoMultiKick( gentity_t *self, qboolean allowSingles, qbo
continue;
kickMove = G_PickAutoKick( self, ent, qfalse );
if ( kickMove == LS_KICK_F_AIR
&& kickMove == LS_KICK_B_AIR
&& kickMove == LS_KICK_R_AIR
&& kickMove == LS_KICK_L_AIR )
|| kickMove == LS_KICK_B_AIR
|| kickMove == LS_KICK_R_AIR
|| kickMove == LS_KICK_L_AIR )
{//in air? Can't do multikicks
}
else
Expand Down
4 changes: 2 additions & 2 deletions code/game/g_active.cpp
View file
Open in desktop
Expand Up @@ -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

&& ent->client->ps.legsAnimTimer <= 10500 )
{
TIMER_Set( ent, "grappleDamageDebounce", 150 );
if ( ent->s.number < MAX_CLIENTS )
Expand Down