From f4f5d9c914d39ba8c345307a7ee02604cccbceed Mon Sep 17 00:00:00 2001
From: dhewg <dhewg@wiibrew.org>
Date: Thu, 8 Dec 2011 01:19:54 +0100
Subject: [PATCH] Fix -Wparentheses warnings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

suggest explicit braces to avoid ambiguous ‘else’
suggest parentheses around ‘&&’ within ‘||’
suggest parentheses around ‘-’ in operand of ‘&’
suggest parentheses around arithmetic in operand of ‘|’
equality comparison with extraneous parentheses

Functional change:
Proper HELLTIME check in Playerview due to missing parentheses.
---
 d3xp/Game_local.h     | 2 +-
 d3xp/PlayerView.cpp   | 2 +-
 d3xp/ai/AI_events.cpp | 2 +-
 game/Game_local.h     | 2 +-
 idlib/BitMsg.cpp      | 6 +++---
 idlib/Heap.cpp        | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/d3xp/Game_local.h b/d3xp/Game_local.h
index 6e9173b..bf9d6b2 100644
--- a/d3xp/Game_local.h
+++ b/d3xp/Game_local.h
@@ -695,7 +695,7 @@ ID_INLINE bool idEntityPtr<type>::IsValid( void ) const {
 template< class type >
 ID_INLINE type *idEntityPtr<type>::GetEntity( void ) const {
 	int entityNum = spawnId & ( ( 1 << GENTITYNUM_BITS ) - 1 );
-	if ( ( gameLocal.spawnIds[ entityNum ] == ( spawnId >> GENTITYNUM_BITS ) ) ) {
+	if ( gameLocal.spawnIds[ entityNum ] == ( spawnId >> GENTITYNUM_BITS ) ) {
 		return static_cast<type *>( gameLocal.entities[ entityNum ] );
 	}
 	return NULL;
diff --git a/d3xp/PlayerView.cpp b/d3xp/PlayerView.cpp
index d869ed3..4dfd258 100644
--- a/d3xp/PlayerView.cpp
+++ b/d3xp/PlayerView.cpp
@@ -1377,7 +1377,7 @@ void FullscreenFX_DoubleVision::HighQuality() {
 		color.z = 0;
 	}
 
-	if ( !gameLocal.isMultiplayer && gameLocal.fast.time < player->inventory.powerupEndTime[ HELLTIME ] || gameLocal.fast.time < player->inventory.powerupEndTime[ INVULNERABILITY ]) {
+	if ( !gameLocal.isMultiplayer && (gameLocal.fast.time < player->inventory.powerupEndTime[ HELLTIME ] || gameLocal.fast.time < player->inventory.powerupEndTime[ INVULNERABILITY ])) {
 		color.y = 0;
 		color.z = 0;
 	}
diff --git a/d3xp/ai/AI_events.cpp b/d3xp/ai/AI_events.cpp
index a7183be..f4c4af2 100644
--- a/d3xp/ai/AI_events.cpp
+++ b/d3xp/ai/AI_events.cpp
@@ -876,7 +876,7 @@ void idAI::Event_CanBecomeSolid( void ) {
 		}
 
 #ifdef _D3XP
-		if ( spawnClearMoveables && hit->IsType( idMoveable::Type ) || hit->IsType( idBarrel::Type ) || hit->IsType( idExplodingBarrel::Type ) ) {
+		if ( (spawnClearMoveables && hit->IsType( idMoveable::Type )) || (hit->IsType( idBarrel::Type ) || hit->IsType( idExplodingBarrel::Type) ) ) {
 			idVec3 push;
 			push = hit->GetPhysics()->GetOrigin() - GetPhysics()->GetOrigin();
 			push.z = 30.f;
diff --git a/game/Game_local.h b/game/Game_local.h
index e66b4d7..83ee163 100644
--- a/game/Game_local.h
+++ b/game/Game_local.h
@@ -628,7 +628,7 @@ ID_INLINE bool idEntityPtr<type>::IsValid( void ) const {
 template< class type >
 ID_INLINE type *idEntityPtr<type>::GetEntity( void ) const {
 	int entityNum = spawnId & ( ( 1 << GENTITYNUM_BITS ) - 1 );
-	if ( ( gameLocal.spawnIds[ entityNum ] == ( spawnId >> GENTITYNUM_BITS ) ) ) {
+	if ( gameLocal.spawnIds[ entityNum ] == ( spawnId >> GENTITYNUM_BITS ) ) {
 		return static_cast<type *>( gameLocal.entities[ entityNum ] );
 	}
 	return NULL;
diff --git a/idlib/BitMsg.cpp b/idlib/BitMsg.cpp
index f6f3b7f..ed8072c 100644
--- a/idlib/BitMsg.cpp
+++ b/idlib/BitMsg.cpp
@@ -515,7 +515,7 @@ int idBitMsg::ReadDeltaByteCounter( int oldValue ) const {
 		return oldValue;
 	}
 	newValue = ReadBits( i );
-	return ( oldValue & ~( ( 1 << i ) - 1 ) | newValue );
+	return ( (oldValue & ~( ( 1 << i ) - 1 ) ) | newValue );
 }
 
 /*
@@ -531,7 +531,7 @@ int idBitMsg::ReadDeltaShortCounter( int oldValue ) const {
 		return oldValue;
 	}
 	newValue = ReadBits( i );
-	return ( oldValue & ~( ( 1 << i ) - 1 ) | newValue );
+	return ( (oldValue & ~( ( 1 << i ) - 1 ) ) | newValue );
 }
 
 /*
@@ -547,7 +547,7 @@ int idBitMsg::ReadDeltaLongCounter( int oldValue ) const {
 		return oldValue;
 	}
 	newValue = ReadBits( i );
-	return ( oldValue & ~( ( 1 << i ) - 1 ) | newValue );
+	return ( ( oldValue & ~( ( 1 << i ) - 1 ) ) | newValue );
 }
 
 /*
diff --git a/idlib/Heap.cpp b/idlib/Heap.cpp
index 0aca5c2..df3d6cc 100644
--- a/idlib/Heap.cpp
+++ b/idlib/Heap.cpp
@@ -333,7 +333,7 @@ void *idHeap::Allocate16( const dword bytes ) {
 			common->FatalError( "malloc failure for %i", bytes );
 		}
 	}
-	alignedPtr = (byte *) ( ( (int) ptr ) + 15 & ~15 );
+	alignedPtr = (byte *) ( ( ( (int) ptr ) + 15) & ~15 );
 	if ( alignedPtr - ptr < 4 ) {
 		alignedPtr += 16;
 	}