Add m_iSlot and m_iPosition handling to tf_weapon_builder, setting values whenever SetSubtype is called

Author: FlaminSarge

src/game/client/tf/c_tf_weapon_builder.cpp

@@ -239,22 +239,6 @@ bool C_TFWeaponBuilder::IsPlacingObject( void )
 	return false;
 }
 
-//-----------------------------------------------------------------------------
-// Purpose: 
-//-----------------------------------------------------------------------------
-int C_TFWeaponBuilder::GetSlot( void ) const
-{
-	return GetObjectInfo( m_iObjectType )->m_SelectionSlot;
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: 
-//-----------------------------------------------------------------------------
-int C_TFWeaponBuilder::GetPosition( void ) const
-{
-	return GetObjectInfo( m_iObjectType )->m_SelectionPosition;
-}
-
 //-----------------------------------------------------------------------------
 // Purpose: 
 //-----------------------------------------------------------------------------

src/game/client/tf/c_tf_weapon_builder.h

@@ -48,9 +48,6 @@ class C_TFWeaponBuilder : public C_TFWeaponBase
 
 	virtual void UpdateAttachmentModels( void );
 
-	virtual int GetSlot( void ) const;
-	virtual int GetPosition( void ) const;
-
 	void SetupObjectSelectionSprite( void );
 
 	virtual CHudTexture const *GetSpriteActive( void ) const;

src/game/server/tf/tf_weapon_builder.cpp

@@ -86,7 +86,11 @@ CTFWeaponBuilder::~CTFWeaponBuilder()
 void CTFWeaponBuilder::SetSubType( int iSubType )
 {
 	m_iObjectType = iSubType;
-	
+
+	const CObjectInfo *pInfo = GetObjectInfo( m_iObjectType );
+	SetSlot( pInfo->m_SelectionSlot );
+	SetPosition( pInfo->m_SelectionPosition );
+
 	// m_iViewModelIndex is set by the base Precache(), which didn't know what
 	// type of object we built, so it didn't get the right viewmodel index.
 	// Now that our data is filled in, go and get the right index.
@@ -1148,22 +1152,6 @@ bool CTFWeaponBuilder::HasAmmo( void )
 	return ( pOwner->GetBuildResources() >= iCost );
 }
 
-//-----------------------------------------------------------------------------
-// Purpose: 
-//-----------------------------------------------------------------------------
-int CTFWeaponBuilder::GetSlot( void ) const
-{
-	return GetObjectInfo( m_iObjectType )->m_SelectionSlot;
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: 
-//-----------------------------------------------------------------------------
-int CTFWeaponBuilder::GetPosition( void ) const
-{
-	return GetObjectInfo( m_iObjectType )->m_SelectionPosition;
-}
-
 //-----------------------------------------------------------------------------
 // Purpose: 
 // Output : char const

src/game/shared/basecombatweapon_shared.h

@@ -649,6 +649,9 @@ class CBaseCombatWeapon : public BASECOMBATWEAPON_DERIVED_FROM
 
 	IPhysicsConstraint		*GetConstraint() { return m_pConstraint; }
 
+	CNetworkVar( int, m_iSlot );				// which bucket this weapon is in
+	CNetworkVar( int, m_iPosition );			// position in the bucket
+
 private:
 	WEAPON_FILE_INFO_HANDLE	m_hWeaponFileInfo;
 	IPhysicsConstraint		*m_pConstraint;
@@ -662,9 +665,6 @@ class CBaseCombatWeapon : public BASECOMBATWEAPON_DERIVED_FROM
 
 	CNetworkVar( short, m_nCustomViewmodelModelIndex );
 
-	CNetworkVar( int, m_iSlot );				// which bucket this weapon is in
-	CNetworkVar( int, m_iPosition );			// position in the bucket
-
 	// Server only
 #if !defined( CLIENT_DLL )