diff options
| author | Narendra Umate <[email protected]> | 2013-09-07 15:43:32 -0700 |
|---|---|---|
| committer | Narendra Umate <[email protected]> | 2013-09-07 15:43:32 -0700 |
| commit | c3ca7291626b60a32008774dd290671708babc20 (patch) | |
| tree | c87d1097bb8b59b6724ca19560f7c92b0309caf3 /mp/src/game/server/hl2 | |
| parent | Update .gitignore. (diff) | |
| parent | Added missing libs for linux and OSX in their new location. (diff) | |
| download | source-sdk-2013-c3ca7291626b60a32008774dd290671708babc20.tar.xz source-sdk-2013-c3ca7291626b60a32008774dd290671708babc20.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mp/src/game/server/hl2')
| -rw-r--r-- | mp/src/game/server/hl2/npc_barnacle.cpp | 5 | ||||
| -rw-r--r-- | mp/src/game/server/hl2/npc_zombine.cpp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mp/src/game/server/hl2/npc_barnacle.cpp b/mp/src/game/server/hl2/npc_barnacle.cpp index 92201730..012d371d 100644 --- a/mp/src/game/server/hl2/npc_barnacle.cpp +++ b/mp/src/game/server/hl2/npc_barnacle.cpp @@ -1810,7 +1810,10 @@ void CNPC_Barnacle::SwallowPrey( void ) #if HL2_EPISODIC
// digest poisonous things for just a moment before being killed by them (it looks wierd if it's instant)
- m_flDigestFinish = gpGlobals->curtime + m_bSwallowingPoison ? 0.48f : 10.0f;
+ // Parentheses were probably intended around the ?: part of the expression, but putting them there now
+ // would change the behavior which is undesirable, so parentheses were placed around the '+' to suppress
+ // compiler warnings.
+ m_flDigestFinish = ( gpGlobals->curtime + m_bSwallowingPoison ) ? 0.48f : 10.0f;
#else
m_flDigestFinish = gpGlobals->curtime + 10.0;
#endif
diff --git a/mp/src/game/server/hl2/npc_zombine.cpp b/mp/src/game/server/hl2/npc_zombine.cpp index 5c74e1a9..611dc682 100644 --- a/mp/src/game/server/hl2/npc_zombine.cpp +++ b/mp/src/game/server/hl2/npc_zombine.cpp @@ -571,7 +571,7 @@ void CNPC_Zombine::HandleAnimEvent( animevent_t *pEvent ) {
pNPC = ppAIs[i];
- if( pNPC->Classify() == CLASS_PLAYER_ALLY || pNPC->Classify() == CLASS_PLAYER_ALLY_VITAL && pNPC->FVisible(this) )
+ if( pNPC->Classify() == CLASS_PLAYER_ALLY || ( pNPC->Classify() == CLASS_PLAYER_ALLY_VITAL && pNPC->FVisible(this) ) )
{
int priority;
Disposition_t disposition;
|