From 6101cec5be5f5ef6b97807708848d1f25646b08d Mon Sep 17 00:00:00 2001 From: XoD Date: Wed, 21 Dec 2011 21:36:58 +0100 Subject: [PATCH 1/3] Fix a test in FX_DoubleVision. It's probably a small bug, powerupEndTime[ INVULNERABILITY ] can be tested in multiplayer game. Signed-off-by: XoD --- neo/d3xp/PlayerView.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neo/d3xp/PlayerView.cpp b/neo/d3xp/PlayerView.cpp index 69ebd68..bf348c8 100644 --- a/neo/d3xp/PlayerView.cpp +++ b/neo/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; } From a725daf17e598400e95a1558b4081d24ec8cec5b Mon Sep 17 00:00:00 2001 From: XoD Date: Wed, 21 Dec 2011 21:48:50 +0100 Subject: [PATCH 2/3] Fix a test in idAI::Event_CanBecomeSolid It's probably a small bug, idBarrel and idExplodingBarrel can by tested event if spawnClearMoveables is false. Signed-off-by: XoD --- neo/d3xp/ai/AI_events.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neo/d3xp/ai/AI_events.cpp b/neo/d3xp/ai/AI_events.cpp index 394561a..02ac1d6 100644 --- a/neo/d3xp/ai/AI_events.cpp +++ b/neo/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; From 015f1a8f3e97025af7b33d6939e2647488bad2a2 Mon Sep 17 00:00:00 2001 From: XoD Date: Wed, 21 Dec 2011 22:07:35 +0100 Subject: [PATCH 3/3] Add parentesis aroud '&' to avoid script warning Gcc warn suggest parentheses arout arithmetic in operand of '|'. Signed-off-by: XoD --- neo/idlib/BitMsg.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neo/idlib/BitMsg.cpp b/neo/idlib/BitMsg.cpp index 13813d9..775de92 100644 --- a/neo/idlib/BitMsg.cpp +++ b/neo/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 ); } /*