From dd0601741fe965e0943f5ab9b5a0b0d93049371a Mon Sep 17 00:00:00 2001 From: The-New-Order Date: Mon, 7 Mar 2022 17:27:44 -0700 Subject: [PATCH] Fixed some warnings --- CMakeLists.txt | 1 + code/game/bg_pmove.cpp | 6 +++--- code/game/g_active.cpp | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bde16bb813..661ba6190e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") diff --git a/code/game/bg_pmove.cpp b/code/game/bg_pmove.cpp index 46643fd41f..95d6d550b2 100644 --- a/code/game/bg_pmove.cpp +++ b/code/game/bg_pmove.cpp @@ -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 diff --git a/code/game/g_active.cpp b/code/game/g_active.cpp index f79a8c2b72..7bc7d138cf 100644 --- a/code/game/g_active.cpp +++ b/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 + && ent->client->ps.legsAnimTimer <= 10500 ) { TIMER_Set( ent, "grappleDamageDebounce", 150 ); if ( ent->s.number < MAX_CLIENTS )