Update tf_player.cpp

Bitl · Bitl · commit 1e33275452a9 · 2025-07-30T10:42:55.000-07:00
diff --git a/src/game/server/tf/tf_player.cpp b/src/game/server/tf/tf_player.cpp
@@ -9652,11 +9652,15 @@ void CTFPlayer::IncrementArmorValue(int nCount, int nMaxValue)
 
 	BaseClass::IncrementArmorValue(nCount, nMaxValue);
 
-	if (ArmorValue() > oldArmor)
+	if (ArmorValue() > 0 && ArmorValue() > oldArmor)
 	{
 		m_Shared.AddCond(QF_COND_ARMOR, -1);
 		m_Shared.RemoveCond(QF_COND_ARMORJUSTBROKE);
 	}
+	else if (ArmorValue() <= 0)
+	{
+		m_Shared.RemoveCond(QF_COND_ARMOR);
+	}
 }
 
 void CTFPlayer::SetArmorValue(int value)
@@ -9668,6 +9672,10 @@ void CTFPlayer::SetArmorValue(int value)
 		m_Shared.AddCond(QF_COND_ARMOR, -1);
 		m_Shared.RemoveCond(QF_COND_ARMORJUSTBROKE);
 	}
+	else if (ArmorValue() <= 0)
+	{
+		m_Shared.RemoveCond(QF_COND_ARMOR);
+	}
 }
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -9652,11 +9652,15 @@ void CTFPlayer::IncrementArmorValue(int nCount, int nMaxValue)`
`9652`	`9652`
`9653`	`9653`	`BaseClass::IncrementArmorValue(nCount, nMaxValue);`
`9654`	`9654`
`9655`		`- if (ArmorValue() > oldArmor)`
	`9655`	`+ if (ArmorValue() > 0 && ArmorValue() > oldArmor)`
`9656`	`9656`	`{`
`9657`	`9657`	`m_Shared.AddCond(QF_COND_ARMOR, -1);`
`9658`	`9658`	`m_Shared.RemoveCond(QF_COND_ARMORJUSTBROKE);`
`9659`	`9659`	`}`
	`9660`	`+ else if (ArmorValue() <= 0)`
	`9661`	`+ {`
	`9662`	`+ m_Shared.RemoveCond(QF_COND_ARMOR);`
	`9663`	`+ }`
`9660`	`9664`	`}`
`9661`	`9665`
`9662`	`9666`	`void CTFPlayer::SetArmorValue(int value)`
`@@ -9668,6 +9672,10 @@ void CTFPlayer::SetArmorValue(int value)`
`9668`	`9672`	`m_Shared.AddCond(QF_COND_ARMOR, -1);`
`9669`	`9673`	`m_Shared.RemoveCond(QF_COND_ARMORJUSTBROKE);`
`9670`	`9674`	`}`
	`9675`	`+ else if (ArmorValue() <= 0)`
	`9676`	`+ {`
	`9677`	`+ m_Shared.RemoveCond(QF_COND_ARMOR);`
	`9678`	`+ }`
`9671`	`9679`	`}`
`9672`	`9680`	`#endif`
`9673`	`9681`