Sync latest code from Team Fortress 2

- Latest code as of 2025/11/07

Author: misyltoad

src/game/client/c_baseplayer.cpp

@@ -418,9 +418,10 @@ LINK_ENTITY_TO_CLASS( player, C_BasePlayer );
 C_BasePlayer::C_BasePlayer() : m_iv_vecViewOffset( "C_BasePlayer::m_iv_vecViewOffset" )
 {
 	AddVar( &m_vecViewOffset, &m_iv_vecViewOffset, LATCH_SIMULATION_VAR );
+
 	AddVar( &m_Local.m_vecPunchAngle, &m_Local.m_iv_vecPunchAngle, LATCH_SIMULATION_VAR );
 	AddVar( &m_Local.m_vecPunchAngleVel, &m_Local.m_iv_vecPunchAngleVel, LATCH_SIMULATION_VAR );
-
+	
 #ifdef _DEBUG																
 	m_vecLadderNormal.Init();
 	m_vecOldViewAngles.Init();

src/game/client/hud_basechat.cpp

@@ -1869,4 +1869,4 @@ void CBaseHudChat::FireGameEvent( IGameEvent *event )
 		ChatPrintf( player->entindex(), CHAT_FILTER_NONE, "(SourceTV) %s", event->GetString( "text" ) );
 	}
 #endif
-}
+}

src/game/client/tf/c_obj_sentrygun.cpp

@@ -758,9 +758,9 @@ const char* C_ObjectSentrygun::GetStatusName() const
 //-----------------------------------------------------------------------------
 // Purpose:
 //-----------------------------------------------------------------------------
-C_SentrygunShield* C_SentrygunShield::Create( const char* pszModelName )
+C_SentrygunShield *C_SentrygunShield::Create( const char *pszModelName )
 {
-	C_SentrygunShield* pShield = new C_SentrygunShield();
+	C_SentrygunShield *pShield = new C_SentrygunShield();
 	if ( !pShield )
 		return NULL;
 
@@ -800,4 +800,4 @@ void C_SentrygunShield::StartFadeOut( float flDuration )
 	m_flFadeOutStartTime = gpGlobals->curtime;
 	m_flFadeOutEndTime = gpGlobals->curtime + flDuration;
 	SetNextClientThink( gpGlobals->curtime );
-}
+}

src/game/client/tf/c_obj_sentrygun.h

@@ -35,7 +35,7 @@ class C_SentrygunShield : public C_BaseAnimating
 	DECLARE_CLASS( C_SentrygunShield, C_BaseAnimating );
 
 public:
-	static C_SentrygunShield* Create( const char* pszModelName );
+	static C_SentrygunShield *Create( const char *pszModelName );
 
 	virtual void ClientThink();
 
@@ -46,6 +46,7 @@ class C_SentrygunShield : public C_BaseAnimating
 	float m_flFadeOutEndTime;
 };
 
+
 //-----------------------------------------------------------------------------
 // Purpose: Sentry object
 //-----------------------------------------------------------------------------

src/game/client/tf/c_tf_player.cpp

@@ -11611,6 +11611,7 @@ void C_TFPlayer::ClientAdjustVOPitch( int& pitch )
 	{
 		pitch *= 1.3f;
 	}
+
 	// Halloween voice futzery?
 	float flVoicePitchScale = 1.f;
 	CALL_ATTRIB_HOOK_FLOAT( flVoicePitchScale, voice_pitch_scale );

src/game/client/tf/tf_hud_account.cpp

@@ -198,7 +198,7 @@ class CAccountPanel : public EditablePanel
 	virtual const char *GetResFileName( void ) { return "resource/UI/HudAccountPanel.res"; }
 
 protected:
-	virtual Color GetColor( const account_delta_t::eAccountDeltaType_t& type, const int iDeltaValue = 0 );
+	virtual Color GetColor( const account_delta_t::eAccountDeltaType_t &type, const int iDeltaValue = 0 );
 
 	CUtlVector <account_delta_t> m_AccountDeltaItems;
 
@@ -1038,15 +1038,15 @@ account_delta_t *CAccountPanel::OnAccountValueChanged( int iOldValue, int iNewVa
 	return NULL;
 }
 
-Color CAccountPanel::GetColor( const account_delta_t::eAccountDeltaType_t& type, const int iDeltaValue )
+Color CAccountPanel::GetColor( const account_delta_t::eAccountDeltaType_t &type, const int iDeltaValue )
 {
 	if ( type == account_delta_t::ACCOUNT_DELTA_BONUS_POINTS )
 	{
 		return m_DeltaEventColor;
 	}
 	else if ( type == account_delta_t::ACCOUNT_DELTA_HEALING )
 	{
-		return iDeltaValue < 0 ? m_DeltaNegativeColor : m_DeltaPositiveColor;
+		return ( iDeltaValue < 0 ) ? m_DeltaNegativeColor : m_DeltaPositiveColor;
 	}
 	else if ( type == account_delta_t::ACCOUNT_DELTA_DAMAGE )
 	{

src/game/client/tf/vgui/charinfo_armory_subpanel.cpp

@@ -23,7 +23,7 @@
 #include <tier0/memdbgon.h>
 
 ConVar tf_explanations_charinfo_armory_panel( "tf_explanations_charinfo_armory_panel", "0", FCVAR_ARCHIVE, "Whether the user has seen explanations for this panel." );
-ConVar tf_armory_page_skip( "tf_armory_page_skip", "10", FCVAR_ARCHIVE, "Number of pages to skip in the Mann Co. Catalogue.", true, 1, true, 100 );
+ConVar tf_armory_page_skip( "tf_armory_page_skip", "10", FCVAR_ARCHIVE, "Number of pages to skip in the Mann Co. Catalog", true, 1, true, 100 );
 
 const char *g_szArmoryFilterStrings[ARMFILT_TOTAL] =
 {
@@ -308,61 +308,61 @@ void CArmoryPanel::OnClosing()
 //-----------------------------------------------------------------------------
 void CArmoryPanel::OnCommand( const char *command )
 {
-	if (!Q_stricmp(command, "prevpage"))
+	if ( !Q_stricmp( command, "prevpage" ) )
 	{
-		if (m_iFilterPage > 0)
+		if ( m_iFilterPage > 0 )
 		{
 			m_iFilterPage--;
 		}
 		else
 		{
-			m_iFilterPage = ceil(m_FilteredItemList.Count() / (float)(m_iThumbnailRows * m_iThumbnailColumns)) - 1;
+			m_iFilterPage = ceil( m_FilteredItemList.Count() / (float)( m_iThumbnailRows * m_iThumbnailColumns ) ) - 1;
 		}
 		UpdateItemList();
 		UpdateSelectedItem();
 	}
-	else if (!Q_stricmp(command, "prevpageskip"))
+	else if ( !Q_stricmp( command, "prevpageskip" ) )
 	{
-		for (int i = 0; i < tf_armory_page_skip.GetInt(); i++)
+		for ( int i = 0; i < tf_armory_page_skip.GetInt(); i++ )
 		{
-			if (m_iFilterPage > 0)
+			if ( m_iFilterPage > 0 )
 			{
 				m_iFilterPage--;
 			}
 			else
 			{
-				m_iFilterPage = ceil(m_FilteredItemList.Count() / (float)(m_iThumbnailRows * m_iThumbnailColumns)) - 1;
+				m_iFilterPage = ceil( m_FilteredItemList.Count() / (float)( m_iThumbnailRows * m_iThumbnailColumns ) ) - 1;
 			}
 		}
 		UpdateItemList();
 		UpdateSelectedItem();
 	}
-	else if (!Q_stricmp(command, "skiptostart"))
+	else if ( !Q_stricmp( command, "skiptostart" ) )
 	{
 		m_iFilterPage = 0;
 		UpdateItemList();
 		UpdateSelectedItem();
 	}
-	else if (!Q_stricmp(command, "nextpage"))
+	else if ( !Q_stricmp( command, "nextpage" ) )
 	{
 		m_iFilterPage++;
-		if (m_iFilterPage > ceil(m_FilteredItemList.Count() / (float)(m_iThumbnailRows * m_iThumbnailColumns)) - 1)
+		if ( m_iFilterPage > ceil( m_FilteredItemList.Count() / (float)( m_iThumbnailRows * m_iThumbnailColumns ) ) - 1 )
 		{
 			m_iFilterPage = 0;
 		}
 		UpdateItemList();
 		UpdateSelectedItem();
 	}
-	else if (!Q_stricmp(command, "nextpageskip"))
+	else if ( !Q_stricmp( command, "nextpageskip" ) )
 	{
-		uint32 unNumPages = ceil(m_FilteredItemList.Count() / (float)(m_iThumbnailRows * m_iThumbnailColumns));
-		m_iFilterPage = ((m_iFilterPage + tf_armory_page_skip.GetInt()) % unNumPages);
+		uint32 unNumPages = ceil( m_FilteredItemList.Count() / (float)( m_iThumbnailRows * m_iThumbnailColumns ) );
+		m_iFilterPage = ( ( m_iFilterPage + tf_armory_page_skip.GetInt() ) % unNumPages );
 		UpdateItemList();
 		UpdateSelectedItem();
 	}
-	else if (!Q_stricmp(command, "skiptoend"))
+	else if ( !Q_stricmp( command, "skiptoend" ) )
 	{
-		m_iFilterPage = ceil(m_FilteredItemList.Count() / (float)(m_iThumbnailRows * m_iThumbnailColumns)) - 1;
+		m_iFilterPage = ceil( m_FilteredItemList.Count() / (float)( m_iThumbnailRows * m_iThumbnailColumns ) ) - 1;
 		UpdateItemList();
 		UpdateSelectedItem();
 	}
@@ -400,7 +400,7 @@ void CArmoryPanel::OnCommand( const char *command )
 				ELanguage iLang = PchLanguageToELanguage( uilanguage );
 
 				char szURL[512];
-				Q_snprintf( szURL, sizeof(szURL), "https://wiki.teamfortress.com/scripts/itemredirect.php?id=%d&lang=%s", m_SelectedItem.GetItemDefIndex(), GetLanguageICUName( iLang ) );
+				Q_snprintf( szURL, sizeof( szURL ), "https://wiki.teamfortress.com/scripts/itemredirect.php?id=%d&lang=%s", m_SelectedItem.GetItemDefIndex(), GetLanguageICUName( iLang ) );
 				steamapicontext->SteamFriends()->ActivateGameOverlayToWebPage( szURL );
 
 				C_CTF_GameStats.Event_Catalog( IE_ARMORY_BROWSE_WIKI, NULL, &m_SelectedItem );

src/game/client/tf/vgui/tf_matchmaking_dashboard_party_member.cpp

@@ -392,7 +392,7 @@ void CDashboardPartyMember::OnCommand( const char *command )
 				{
 					case MEMBER_PRESENT:
 					{
-						// You can always send a message to party memebers
+						// You can always send a message to party members
 						contextMenuBuilder.AddMenuItem( "#TF_Friends_SendMessage", new KeyValues( "Context_SendMessage" ), "party" );
 
 						// If we're the leader, we can kick

src/game/client/tf/workshop/item_import.cpp

@@ -88,6 +88,7 @@ static const char *kBodygroupArray[] =
 	"headphones",
 	"shoes",
 	"shoes_socks",
+	"bullets"
 };
 
 extern IFileSystem *g_pFullFileSystem;
@@ -6998,6 +6999,9 @@ CTFFileImportDialog::LOAD_RESULT CTFFileImportDialog::LoadTxt( const char *pszFi
 			}
 		}
 
+		char szFileBase[ MAX_PATH ];
+		V_FileBase( pszSourceFile, szFileBase, sizeof( szFileBase ) );
+
 		LOAD_RESULT result = SetAnimationSource( nClassIndex, pszSourceFile );
 		if ( result != LOAD_OKAY )
 		{
@@ -7013,6 +7017,23 @@ CTFFileImportDialog::LOAD_RESULT CTFFileImportDialog::LoadTxt( const char *pszFi
 				V_ComposeFileName( pszBasePath, pszVCDFile, pszLoadPath, sizeof(pszLoadPath) );
 				pszVCDFile = pszLoadPath;
 			}
+
+			if ( !g_pFullFileSystem->FileExists( pszVCDFile, "MOD" ) )
+			{
+				const char *pszTempVCDFile = pszVCDFile;
+
+				// If the file isn't found using the path in the manifest, let's look where we think it should be on disk. 
+				// We're sometimes seeing absolute paths for the creator's hard drive in the manifest for the vcd_file.
+				char szFallbackTest[ MAX_PATH ];
+				V_sprintf_safe( szFallbackTest, "%sgame\\scenes\\%s\\player\\%s\\low\\%s.vcd", pszBasePath, GetWorkshopFolder(), kClassFolders[ nClassIndex ], szFileBase );
+				pszVCDFile = szFallbackTest;
+
+				if ( !g_pFullFileSystem->FileExists( pszVCDFile, "MOD" ) )
+				{
+					// Set it back to the original value and let it fail below.
+					pszVCDFile = pszTempVCDFile;
+				}
+			}
 		}
 
 		result = SetAnimationVCD( nClassIndex, pszVCDFile );

src/game/server/ai_behavior_assault.cpp

@@ -1257,7 +1257,7 @@ int CAI_AssaultBehavior::TranslateSchedule( int scheduleType )
 		break;
 
 	case SCHED_HOLD_RALLY_POINT:
-		if( HasCondition(COND_NO_PRIMARY_AMMO) | HasCondition(COND_LOW_PRIMARY_AMMO) )
+		if( HasCondition(COND_NO_PRIMARY_AMMO) || HasCondition(COND_LOW_PRIMARY_AMMO) )
 		{
 			return SCHED_RELOAD;
 		}