feat(asw_player): add client rd_pref_spectate_marine_profile???

Author: anf3is

src/game/client/swarm/c_asw_player.cpp

@@ -149,6 +149,7 @@ ConVar asw_turret_fog_end( "asw_turret_fog_end", "1200", 0, "Fog end distance fo
 
 ConVar rd_force_spectate_marine( "rd_force_spectate_marine", "-1", FCVAR_DONTRECORD, "spectate this marine resource index if it exists", true, -1, true, ASW_MAX_MARINE_RESOURCES );
 ConVar rd_force_spectate_marine_profile( "rd_force_spectate_marine_profile", "-1", FCVAR_DONTRECORD, "spectate this marine profile if it exists", true, -1, true, ASW_NUM_MARINE_PROFILES );
+ConVar rd_pref_spectate_marine_profile( "rd_pref_spectate_marine_profile", "-1", FCVAR_NONE, "Prefer to spectate this marine profile", true, -1, true, ASW_NUM_MARINE_PROFILES );
 
 extern ConVar asw_allow_detach;
 extern ConVar asw_stim_cam_time;
@@ -928,6 +929,24 @@ C_ASW_Inhabitable_NPC *C_ASW_Player::GetViewNPC() const
 	return pNPC;
 }
 
+C_ASW_Inhabitable_NPC *C_ASW_Player::GetPreferredSpectatingMarine() const
+{
+	if ( ASWGameResource() && ( engine->IsPlayingDemo() || m_hSpectating.Get() ) )
+	{
+		const int iProfile = rd_pref_spectate_marine_profile.GetInt();
+		if ( iProfile != -1 )
+		{
+			C_ASW_Marine_Resource *pMR = ASWGameResource()->GetMarineResourceForProfile( iProfile );
+			if ( pMR && pMR->GetMarineEntity() )
+			{
+				return pMR->GetMarineEntity();
+			}
+		}
+	}
+
+	return NULL;
+}
+
 HSCRIPT C_ASW_Player::Script_GetMarine() const
 {
 	return ToHScript( C_ASW_Marine::AsMarine( GetNPC() ) );

src/game/client/swarm/c_asw_player.h

@@ -156,6 +156,7 @@ class C_ASW_Player : public C_BasePlayer, public IASWPlayerAnimStateHelpers
 	C_ASW_Inhabitable_NPC *GetNPC() const;
 	C_ASW_Inhabitable_NPC *GetSpectatingNPC() const;
 	C_ASW_Inhabitable_NPC *GetViewNPC() const;
+	C_ASW_Inhabitable_NPC *GetPreferredSpectatingMarine() const;
 	HSCRIPT Script_GetMarine() const;
 	HSCRIPT Script_GetNPC() const;
 	HSCRIPT Script_GetSpectatingNPC() const;

src/game/server/swarm/asw_player.cpp

@@ -2180,6 +2180,13 @@ void CASW_Player::SpectateNextMarine()
 		return;
 	CASW_Marine *pFirst = NULL;
 	//Msg("CASW_Player::SpectateNextMarine\n");
+#ifdef GAME_DLL
+	{
+		pFirst = GetPreferredSpectatingMarine();
+		if ( !pFirst || !pFirst->IsAlive() || pFirst->GetHealth() <= 0 )
+			pFirst = NULL;
+	}
+#endif // GAME_DLL
 
 	// loop through all marines
 	for (int i=0;i<pGameResource->GetMaxMarineResources();i++)