Implement ValveSoftware#1444 and ValveSoftware#1439

Author: Bitl

game/quiver/info_changelog.txt

@@ -42,7 +42,8 @@ Quiver Private Alpha 1.1.0 (WIP):
 - Added the following Source SDK Pull Requests:
 	- #1437: MvM: Fix Explosive Headshot working on invulnerable target
 	- #1440: Treat being in background map as not in-game
-	- 
+	- #1439: Network player's handedness preference to spectators
+	- #1444: Hide intel upgrade hud when no intel is enabled
 
 Quiver Private Alpha 1.0.1:
 - Whitelisted the Back Scatter and Force-a-Nature.

src/game/client/c_baseviewmodel.cpp

@@ -19,6 +19,9 @@
 #include <KeyValues.h>
 #include "hltvcamera.h"
 #ifdef TF_CLIENT_DLL
+#ifdef BDSBASE
+	#include "c_tf_player.h"
+#endif
 	#include "tf_weaponbase.h"
 #endif
 
@@ -91,6 +94,24 @@ void FormatViewModelAttachment( Vector &vOrigin, bool bInverse )
 	vOrigin = pViewSetup->origin + vOut;
 }
 
+#ifdef BDSBASE
+#ifdef TF_CLIENT_DLL
+bool TeamFortress_ShouldFlipClientViewModel(void)
+{
+	if (IsLocalPlayerSpectator())
+	{
+		// Use spectated client's handedness preference
+		C_TFPlayer* pSpecTarget = ToTFPlayer(UTIL_PlayerByIndex(GetSpectatorTarget()));
+		if (pSpecTarget)
+		{
+			return pSpecTarget->m_bFlipViewModels;
+		}
+	}
+
+	return cl_flipviewmodels.GetBool();
+}
+#endif //TF_CLIENT_DLL
+#endif
 
 void C_BaseViewModel::FormatViewModelAttachment( int nAttachment, matrix3x4_t &attachmentToWorld )
 {
@@ -211,7 +232,11 @@ bool C_BaseViewModel::ShouldFlipViewModel()
 	CBaseCombatWeapon *pWeapon = m_hWeapon.Get();
 	if ( pWeapon )
 	{
+#ifdef BDSBASE
+		return pWeapon->m_bFlipViewModel != TeamFortress_ShouldFlipClientViewModel();
+#else
 		return pWeapon->m_bFlipViewModel != cl_flipviewmodels.GetBool();
+#endif
 	}
 #ifdef BDSBASE
 	return cl_flipviewmodels.GetBool(); // hack for scout ball projeciles to have properly flipped viewmodels

src/game/client/c_baseviewmodel.h

@@ -16,4 +16,10 @@
 #include "utlvector.h"
 #include "baseviewmodel_shared.h"
 
+#ifdef BDSBASE
+#ifdef TF_CLIENT_DLL
+bool TeamFortress_ShouldFlipClientViewModel(void);
+#endif //TF_CLIENT_DLL
+#endif
+
 #endif // C_BASEVIEWMODEL_H

src/game/client/tf/c_tf_player.cpp

@@ -3945,6 +3945,9 @@ IMPLEMENT_CLIENTCLASS_DT( C_TFPlayer, DT_TFPlayer, CTFPlayer )
 	RecvPropFloat( RECVINFO( m_flMvMLastDamageTime ) ),
 	RecvPropFloat( RECVINFO_NAME( m_flMvMLastDamageTime, "m_flLastDamageTime" ) ), // Renamed
 	RecvPropInt( RECVINFO( m_iSpawnCounter ) ),
+#ifdef BDSBASE
+	RecvPropBool(RECVINFO(m_bFlipViewModels)),
+#endif
 	RecvPropBool( RECVINFO( m_bArenaSpectator ) ),
 
 	RecvPropDataTable( RECVINFO_DT( m_AttributeManager ), 0, &REFERENCE_RECV_TABLE(DT_AttributeManager) ),

src/game/client/tf/c_tf_player.h

@@ -702,6 +702,10 @@ class C_TFPlayer : public C_BasePlayer, public IHasAttributes, public IInventory
 	int				m_iSpawnCounter;
 	bool			m_bArenaSpectator;
 
+#ifdef BDSBASE
+	bool			m_bFlipViewModels;
+#endif
+
 	bool			m_bIsMiniBoss;
 	bool			m_bIsABot;
 	int				m_nBotSkill;

src/game/client/tf/tf_hud_mann_vs_machine_status.cpp

@@ -2222,7 +2222,24 @@ void CTFHudMannVsMachineStatus::ReopenVictoryPanel( void )
 //-----------------------------------------------------------------------------
 void CTFHudMannVsMachineStatus::UpdateBombCarrierProgress ( void )
 {
+#ifdef BDSBASE
+	bool bEnabledFlags = false;
+
+	for (int i = 0; i < ICaptureFlagAutoList::AutoList().Count(); ++i)
+	{
+		CCaptureFlag* pFlag = static_cast<CCaptureFlag*>(ICaptureFlagAutoList::AutoList()[i]);
+
+		if (pFlag && !pFlag->IsDisabled())
+		{
+			bEnabledFlags = true;
+			break;
+		}
+	}
+
+	m_pUpgradeLevelContainer->SetVisible(bEnabledFlags && (TFGameRules()->State_Get() == GR_STATE_RND_RUNNING));
+#else
 	m_pUpgradeLevelContainer->SetVisible( TFGameRules()->State_Get() == GR_STATE_RND_RUNNING );
+#endif
 
 	if ( !m_pUpgradeLevel1 || !m_pUpgradeLevel2 || !m_pUpgradeLevel3 || !m_pUpgradeLevelBoss )
 		return;

src/game/server/tf/tf_player.cpp

@@ -881,6 +881,9 @@ IMPLEMENT_SERVERCLASS_ST( CTFPlayer, DT_TFPlayer )
 
 	SendPropFloat( SENDINFO( m_flMvMLastDamageTime ), 16, SPROP_ROUNDUP ),
 	SendPropInt( SENDINFO( m_iSpawnCounter ) ),
+#ifdef BDSBASE
+	SendPropBool(SENDINFO(m_bFlipViewModels)),
+#endif
 	SendPropBool( SENDINFO( m_bArenaSpectator ) ),
 	SendPropFloat( SENDINFO( m_flHeadScale ) ),
 	SendPropFloat( SENDINFO( m_flTorsoScale ) ),

src/game/server/tf/tf_player.h

@@ -1055,7 +1055,11 @@ class CTFPlayer : public CBaseMultiplayerPlayer, public IHasAttributes, public I
 #endif
 	int					m_iOldStunFlags;
 
+#ifdef BDSBASE
+	CNetworkVar(bool, m_bFlipViewModels);
+#else
 	bool				m_bFlipViewModels;
+#endif
 	int					m_iBlastJumpState;
 	float				m_flBlastJumpLandTime;
 	bool				m_bTakenBlastDamageSinceLastMovement;

src/game/shared/econ/econ_entity.cpp

@@ -19,6 +19,9 @@
 #include "cdll_util.h"
 
 #if defined(TF_CLIENT_DLL)
+#ifdef BDSBASE
+#include "c_baseviewmodel.h"
+#endif
 #include "c_tf_player.h"
 #include "tf_gamerules.h"
 #include "c_playerresource.h"
@@ -91,9 +94,11 @@ BEGIN_ENT_SCRIPTDESC( CEconEntity, CBaseAnimating, "Econ Entity" )
 END_SCRIPTDESC();
 #endif
 
+#ifndef BDSBASE
 #ifdef TF_CLIENT_DLL
 extern ConVar cl_flipviewmodels;
 #endif
+#endif
 
 
 #ifdef CLIENT_DLL
@@ -857,7 +862,11 @@ int C_ViewmodelAttachmentModel::InternalDrawModel( int flags )
 {
 #ifdef TF_CLIENT_DLL
 	CMatRenderContextPtr pRenderContext( materials );
+#ifdef BDSBASE
+	if (TeamFortress_ShouldFlipClientViewModel() != m_bAlwaysFlip)
+#else
 	if ( cl_flipviewmodels.GetBool() != m_bAlwaysFlip )
+#endif
 	{
 		pRenderContext->CullMode( MATERIAL_CULLMODE_CW );
 	}

src/game/shared/tf/tf_weaponbase.cpp

@@ -47,6 +47,9 @@
 #include "tf_gamestats.h"
 // Client specific.
 #else
+#ifdef BDSBASE
+#include "c_baseviewmodel.h"
+#endif
 #include "c_tf_player.h"
 #include "tf_viewmodel.h"
 #include "hud_crosshair.h"
@@ -91,8 +94,10 @@ extern ConVar tf_weapon_criticals_bucket_bottom;
 
 #ifdef CLIENT_DLL
 extern ConVar cl_crosshair_file;
+#ifndef BDSBASE
 extern ConVar cl_flipviewmodels;
 #endif
+#endif
 
 //=============================================================================
 //
@@ -5859,8 +5864,12 @@ bool CTFWeaponBase::IsViewModelFlipped( void )
 	{
 		return true;
 	}
+#else
+#ifdef BDSBASE
+	if (m_bFlipViewModel != TeamFortress_ShouldFlipClientViewModel())
 #else
 	if ( m_bFlipViewModel != cl_flipviewmodels.GetBool() )
+#endif
 	{
 		return true;
 	}
@@ -7045,7 +7054,11 @@ void CTFWeaponBase::AddStatTrakModel( CEconItemView *pItem, int nStatTrakType, A
 				pStatTrakEnt->m_nSkin = nSkin;
 				m_viewmodelStatTrakAddon = pStatTrakEnt;
 
+#ifdef BDSBASE
+				if (TeamFortress_ShouldFlipClientViewModel())
+#else
 				if ( cl_flipviewmodels.GetBool() )
+#endif
 				{
 					pStatTrakEnt->SetBodygroup( 1, 1 ); // use a special mirror-image stattrak module that appears correct for lefties
 					flScale *= -1.0f;					// flip scale