fix some more things that wanted profile rather than slot number

ReactiveDrop · Oct 13, 2023 · f981bb8 · f981bb8
1 parent cf50666
commit f981bb8
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 25 deletions.
diff --git a/src/game/client/swarm/asw_briefing.cpp b/src/game/client/swarm/asw_briefing.cpp
@@ -754,25 +754,17 @@ bool CASW_Briefing::IsWeaponUnlocked( const char *szWeaponClass )
 	return pPlayer->IsWeaponUnlocked( szWeaponClass );
 }
 
-void CASW_Briefing::SelectWeapon( int nProfileIndex, int nInventorySlot, int nEquipIndex, SteamItemInstanceID_t iItemInstance )
+void CASW_Briefing::SelectWeapon( int nMarineIndex, int nInventorySlot, int nEquipIndex, SteamItemInstanceID_t iItemInstance )
 {
 	C_ASW_Player *pPlayer = C_ASW_Player::GetLocalASWPlayer();
 	if ( !pPlayer )
 		return;
 
-	for ( int i = 0; i < ASWGameResource()->GetMaxMarineResources(); i++ )
-	{
-		C_ASW_Marine_Resource *pMR = ASWGameResource()->GetMarineResource( i );
-		if ( !pMR )
-			continue;
+	C_ASW_Marine_Resource *pMR = ASWGameResource()->GetMarineResource( nMarineIndex );
+	if ( !pMR )
+		return;
 
-		if ( pMR->GetProfileIndex() == nProfileIndex )
-		{
-			int nMarineResourceIndex = ASWGameResource()->GetIndexFor( pMR );
-			pPlayer->LoadoutSelectEquip( nMarineResourceIndex, nInventorySlot, nEquipIndex, iItemInstance );
-			return;
-		}
-	}
+	pPlayer->LoadoutSelectEquip( nMarineIndex, nInventorySlot, nEquipIndex, iItemInstance );
 }
 
 void CASW_Briefing::ToggleLocalPlayerReady()

diff --git a/src/game/client/swarm/asw_briefing.h b/src/game/client/swarm/asw_briefing.h
@@ -68,7 +68,7 @@ class CASW_Briefing : public IBriefing
 
 	virtual void SelectMarine( int nOrder, int nProfileIndex, int nPreferredLobbySlot );
 	virtual void SelectBot( int nOrder, int nProfileIndex );
-	virtual void SelectWeapon( int nProfileIndex, int nInventorySlot, int nEquipIndex, SteamItemInstanceID_t iItemInstance );
+	virtual void SelectWeapon( int nMarineIndex, int nInventorySlot, int nEquipIndex, SteamItemInstanceID_t iItemInstance );
 	virtual void AutoSelectFullSquadForSingleplayer( int nFirstSelectedProfileIndex );
 
 	virtual void ResetLastChatterTime() { m_flLastSelectionChatterTime = 0.0f; }

diff --git a/src/game/client/swarm/gameui/swarm/vloadouts.cpp b/src/game/client/swarm/gameui/swarm/vloadouts.cpp
@@ -411,22 +411,22 @@ bool Loadouts::IsWeaponUnlocked( const char *szWeaponClass )
 	return UTIL_ASW_CommanderLevelAtLeast( NULL, GetWeaponLevelRequirement( szWeaponClass ), -1 );
 }
 
-void Loadouts::SelectWeapon( int nProfileIndex, int nInventorySlot, int nEquipIndex, SteamItemInstanceID_t iItemInstance )
+void Loadouts::SelectWeapon( int nMarineIndex, int nInventorySlot, int nEquipIndex, SteamItemInstanceID_t iItemInstance )
 {
 	if ( nInventorySlot == ASW_INVENTORY_SLOT_PRIMARY )
 	{
-		asw_default_primary[nProfileIndex].SetValue( nEquipIndex );
-		rd_equipped_weapon_primary[nProfileIndex].SetValue( VarArgs( "%llu", iItemInstance ) );
+		asw_default_primary[nMarineIndex].SetValue( nEquipIndex );
+		rd_equipped_weapon_primary[nMarineIndex].SetValue( VarArgs( "%llu", iItemInstance ) );
 	}
 	else if ( nInventorySlot == ASW_INVENTORY_SLOT_SECONDARY )
 	{
-		asw_default_secondary[nProfileIndex].SetValue( nEquipIndex );
-		rd_equipped_weapon_secondary[nProfileIndex].SetValue( VarArgs( "%llu", iItemInstance ) );
+		asw_default_secondary[nMarineIndex].SetValue( nEquipIndex );
+		rd_equipped_weapon_secondary[nMarineIndex].SetValue( VarArgs( "%llu", iItemInstance ) );
 	}
 	else if ( nInventorySlot == ASW_INVENTORY_SLOT_EXTRA )
 	{
-		asw_default_extra[nProfileIndex].SetValue( nEquipIndex );
-		rd_equipped_weapon_extra[nProfileIndex].SetValue( VarArgs( "%llu", iItemInstance ) );
+		asw_default_extra[nMarineIndex].SetValue( nEquipIndex );
+		rd_equipped_weapon_extra[nMarineIndex].SetValue( VarArgs( "%llu", iItemInstance ) );
 	}
 
 	engine->ClientCmd_Unrestricted( "host_writeconfig\n" );

diff --git a/src/game/client/swarm/gameui/swarm/vloadouts.h b/src/game/client/swarm/gameui/swarm/vloadouts.h
@@ -98,7 +98,7 @@ class Loadouts : public CBaseModFrame, public IBriefing
 	bool IsCommanderSpeaking( int nLobbySlot ) override { return false; }
 	void SelectMarine( int nOrder, int nProfileIndex, int nPreferredLobbySlot ) override {}
 	void SelectBot( int nOrder, int nProfileIndex ) override {}
-	void SelectWeapon( int nProfileIndex, int nInventorySlot, int nEquipIndex, SteamItemInstanceID_t iItemInstance ) override;
+	void SelectWeapon( int nMarineIndex, int nInventorySlot, int nEquipIndex, SteamItemInstanceID_t iItemInstance ) override;
 	void AutoSelectFullSquadForSingleplayer( int nFirstSelectedProfileIndex ) override {}
 	void ResetLastChatterTime() override {}
 	const static IBriefing_ItemInstance s_EmptyItemInstance;

diff --git a/src/game/client/swarm/ibriefing.h b/src/game/client/swarm/ibriefing.h
@@ -64,7 +64,7 @@ abstract_class IBriefing
 
 	virtual void SelectMarine( int nOrder, int nProfileIndex, int nPreferredLobbySlot ) = 0;
 	virtual void SelectBot( int nOrder, int nProfileIndex) = 0;
-	virtual void SelectWeapon( int nProfileIndex, int nInventorySlot, int nEquipIndex, SteamItemInstanceID_t iItemInstance ) = 0;
+	virtual void SelectWeapon( int nMarineIndex, int nInventorySlot, int nEquipIndex, SteamItemInstanceID_t iItemInstance ) = 0;
 	virtual void AutoSelectFullSquadForSingleplayer( int nFirstSelectedProfileIndex ) = 0;
 
 	virtual void ResetLastChatterTime() = 0;

diff --git a/src/game/client/swarm/rd_collections_equipment.cpp b/src/game/client/swarm/rd_collections_equipment.cpp
@@ -1169,7 +1169,7 @@ void CRD_Collection_Panel_Equipment::OnCommand( const char *command )
 			pMedalStore->OnSelectedEquipment( m_pWeapon->Extra, m_pWeapon->EquipIndex );
 		}
 
-		m_pTab->m_pBriefing->SelectWeapon( m_pTab->m_pProfile->m_ProfileIndex, m_pTab->m_nInventorySlot, m_pWeapon->EquipIndex, m_ItemInstance.ItemID );
+		m_pTab->m_pBriefing->SelectWeapon( m_pTab->m_nLobbySlot, m_pTab->m_nInventorySlot, m_pWeapon->EquipIndex, m_ItemInstance.ItemID );
 
 		m_pTab->m_pParent->MarkForDeletion();
 	}

diff --git a/src/game/server/swarm/asw_player.cpp b/src/game/server/swarm/asw_player.cpp
@@ -887,7 +887,7 @@ bool CASW_Player::ClientCommand( const CCommand &args )
 					}
 				}
 				CASW_Marine_Resource *pMR = ASWGameResource()->GetMarineResource( iMarineIndex );
-				if ( !pMR || pMR->GetCommander() != this || pMR->GetProfileIndex() == iProfileIndex )
+				if ( !pMR || pMR->GetCommander() != this || pMR->GetProfileIndex() != iProfileIndex )
 				{
 					Warning( "Player sent bad loadouta command\n" );
 					return false;