summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
author/dev/humancontroller <devhc@example.com>2017-04-13 11:30:00 +0000
committer/dev/humancontroller <devhc@example.com>2017-04-15 17:24:16 +0200
commit787ae313812f0a385f3cec9216fa0e67df148ca7 (patch)
tree1a237cba93c991aa09280b2765a23a41179a91ab /src/game
parent979776bf1d7319218d84dd488ed69a45a854dce1 (diff)
fix a bunch of C-specific programming errors
detected by Clang
Diffstat (limited to 'src/game')
-rw-r--r--src/game/bg_public.h2
-rw-r--r--src/game/g_active.c2
-rw-r--r--src/game/g_buildable.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index 817b7aa..cbb2def 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -1014,7 +1014,7 @@ typedef struct
int meansOfDeath;
int team;
- weapon_t buildWeapon;
+ int buildWeapon;
int idleAnim;
diff --git a/src/game/g_active.c b/src/game/g_active.c
index 147aabc..bfbec2a 100644
--- a/src/game/g_active.c
+++ b/src/game/g_active.c
@@ -236,7 +236,7 @@ static void G_ClientShove( gentity_t *ent, gentity_t *victim )
VectorNormalizeFast( dir );
// don't break the dretch elevator
- if( abs( dir[ 2 ] ) > abs( dir[ 0 ] ) && abs( dir[ 2 ] ) > abs( dir[ 1 ] ) )
+ if( fabs( dir[ 2 ] ) > fabs( dir[ 0 ] ) && fabs( dir[ 2 ] ) > fabs( dir[ 1 ] ) )
return;
VectorScale( dir,
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index b8ecad4..983e259 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -2229,8 +2229,8 @@ qboolean HMGTurret_TrackEnemy( gentity_t *self )
vectoangles( dirToTarget, self->turretAim );
//if pointing at our target return true
- if( abs( angleToTarget[ YAW ] - self->s.angles2[ YAW ] ) <= accuracyTolerance &&
- abs( angleToTarget[ PITCH ] - self->s.angles2[ PITCH ] ) <= accuracyTolerance )
+ if( fabs( angleToTarget[ YAW ] - self->s.angles2[ YAW ] ) <= accuracyTolerance &&
+ fabs( angleToTarget[ PITCH ] - self->s.angles2[ PITCH ] ) <= accuracyTolerance )
return qtrue;
return qfalse;