id-software/doom3.gpl
1
0
Fork 0
mirror of https://github.com/TTimo/doom3.gpl.git synced 2026-03-19 16:39:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32 from xoddark/Werror_parentheses

Browse Source 
Fix parentheses warning
This commit is contained in:
Timothee "TTimo" Besset
2011-12-29 09:42:30 -08:00
parent 232432d352 015f1a8f3e
commit d5f751654d
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
neo/d3xp/PlayerView.cpp
View File

@@ -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;
}

2
neo/d3xp/ai/AI_events.cpp
View File

@@ -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;

6
neo/idlib/BitMsg.cpp
View File

@@ -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 );
}
/*