Merge remote-tracking branch 'upstream/master' into release/no-gc-test

Author: mastercoms

src/game/client/tf/c_tf_player.cpp

@@ -3256,6 +3256,49 @@ bool CStatTrakDigitProxy::HelperOnBindGetStatTrakScore( void *pC_BaseEntity, int
 				}
 			}
 		}
+		else
+		{
+			CTFWeaponBase* pWeap = NULL;
+
+			// Check if it's an attachment for world model
+			C_TFWeaponAttachmentModel* pAttachment = dynamic_cast<C_TFWeaponAttachmentModel*>( pEntity );
+			if ( pAttachment )
+			{
+				// If we're dealing with a world model, Stat Clock will be it's child attachment
+				C_BaseEntity* pParent = pAttachment->GetMoveParent();
+				if ( pParent )
+				{
+					pWeap = dynamic_cast<CTFWeaponBase*>( pParent );
+				}
+			}
+
+			if ( pWeap )
+			{
+				CEconItemView* pItem = pWeap->GetAttributeContainer()->GetItem();
+				if ( pItem && pItem->FindAttribute( GetKillEaterAttr_Score( 0 ), &unScore ) )
+				{
+					*piScore = unScore;
+					bReturnValue = true;
+				}
+			}
+			else
+			{
+				// Are we dealing with a dropped weapon?
+				C_BaseEntity* pParent = pEntity->GetMoveParent();
+				CTFDroppedWeapon* pDroppedWeapon = dynamic_cast<CTFDroppedWeapon*>( pParent );
+
+				if ( pDroppedWeapon )
+				{
+					// We're able to extract item attributes from dropped weapons, including strange count
+					CEconItemView* pItem = pDroppedWeapon->GetItem();
+					if ( pItem && pItem->FindAttribute( GetKillEaterAttr_Score( 0 ), &unScore ) )
+					{
+						*piScore = unScore;
+						bReturnValue = true;
+					}
+				}
+			}
+		}
 	}
 	else
 	{

src/game/shared/tf/entity_capture_flag.cpp

@@ -573,16 +573,6 @@ bool CCaptureFlag::ShouldHideGlowEffect( void )
 			// In non-CTF control the flag changes to the team that's carrying it
 			bIsHiddenTeam = ( pLocalPlayer->GetTeamNumber() != TEAM_SPECTATOR && pLocalPlayer->GetTeamNumber() != GetTeamNumber() );
 		}
-
-		// UNDONE(mcoms): why is this here? if WE'RE invisible, we can't see people carrying the flag?
-#if 0
-		if ( pLocalPlayer->m_Shared.IsFullyInvisible() )
-		{
-			C_TFPlayer *pOwner = ToTFPlayer( m_hPrevOwner );
-			if ( pOwner && pOwner != pLocalPlayer )
-				return true;
-		}
-#endif
 	}
 
 	bool bHide = IsStolen() && bIsHiddenTeam;
@@ -2615,20 +2605,6 @@ void CCaptureFlag::Simulate( void )
 	BaseClass::Simulate();
 
 	ManageTrailEffects();
-
-	C_TFPlayer *pLocalPlayer = C_TFPlayer::GetLocalTFPlayer();
-	if ( m_hPrevOwner && m_hPrevOwner->IsPlayer() && pLocalPlayer && pLocalPlayer->m_Shared.IsFullyInvisible() && !IsEffectActive( EF_NODRAW ) )
-	{
-		C_TFPlayer *pTFOwner = ToTFPlayer( m_hPrevOwner );
-		if ( pTFOwner && pTFOwner != pLocalPlayer )
-		{
-			AddEffects( EF_NODRAW );
-		}
-	}
-	else if ( IsEffectActive( EF_NODRAW ) && ( IsStolen() || IsDropped() ) )
-	{
-		RemoveEffects( EF_NODRAW );
-	}
 }
 
 void CCaptureFlag::ManageTrailEffects( void )