CInfClassInfected: Mark FindWitchSpawnPosition() const

Author: Kaffeine

src/game/server/infclass/classes/infected/infected.cpp

@@ -25,6 +25,17 @@ CInfClassInfected::CInfClassInfected(CInfClassPlayer *pPlayer)
 	SetNormalEmote(EMOTE_ANGRY);
 }
 
+const CInfClassInfected *CInfClassInfected::GetInstance(const CInfClassCharacter *pCharacter)
+{
+	const CInfClassPlayerClass *pClass = pCharacter ? pCharacter->GetClass() : nullptr;
+	if(pClass && pClass->IsZombie())
+	{
+		return static_cast<const CInfClassInfected*>(pClass);
+	}
+
+	return nullptr;
+}
+
 CInfClassInfected *CInfClassInfected::GetInstance(CInfClassCharacter *pCharacter)
 {
 	CInfClassPlayerClass *pClass = pCharacter ? pCharacter->GetClass() : nullptr;
@@ -806,11 +817,11 @@ CSlugSlime *CInfClassInfected::PlaceSlime(vec2 PlaceToPos, float MinDistance)
 	return pNewSlime;
 }
 
-bool CInfClassInfected::FindWitchSpawnPosition(vec2 &Position)
+bool CInfClassInfected::FindWitchSpawnPosition(vec2 &Position) const
 {
 	float Angle = atan2f(m_pCharacter->m_Input.m_TargetY, m_pCharacter->m_Input.m_TargetX);//atan2f instead of atan2
 
-	for(int i=0; i<32; i++)
+	for(int i = 0; i < 32; i++)
 	{
 		float TestAngle;
 

src/game/server/infclass/classes/infected/infected.h

@@ -15,6 +15,7 @@ class CInfClassInfected : public CInfClassPlayerClass
 public:
 	CInfClassInfected(CInfClassPlayer *pPlayer);
 
+	static const CInfClassInfected *GetInstance(const CInfClassCharacter *pCharacter);
 	static CInfClassInfected *GetInstance(CInfClassCharacter *pCharacter);
 
 	bool IsHuman() const final { return false; }
@@ -54,7 +55,7 @@ class CInfClassInfected : public CInfClassPlayerClass
 	void IncreaseGhoulLevel(int Diff);
 	int GetGhoulLevel() const;
 
-	bool FindWitchSpawnPosition(vec2 &Position);
+	bool FindWitchSpawnPosition(vec2 &Position) const;
 
 	void PrepareToDie(DeathContext *pContext) override;
 

src/game/server/infclass/infcgamecontroller.cpp

@@ -5353,14 +5353,14 @@ bool CInfClassGameController::TryRespawn(CInfClassPlayer *pPlayer, SpawnContext
 			if(Iter.Player()->GetClass() != EPlayerClass::Witch)
 				continue;
 
-			CInfClassCharacter *pCharacter = Iter.Player()->GetCharacter();
-			if(!pCharacter)
+			const CInfClassCharacter *pCharacter = Iter.Player()->GetCharacter();
+			if(!pCharacter || !pCharacter->IsAlive())
 				continue;
 
 			if(pCharacter->IsFrozen())
 				continue;
 
-			CInfClassInfected *pInfected = CInfClassInfected::GetInstance(pCharacter);
+			const CInfClassInfected *pInfected = CInfClassInfected::GetInstance(pCharacter);
 
 			if(pInfected->FindWitchSpawnPosition(pContext->SpawnPos))
 			{