Fix CTF backpack sound still playing when not giving ammo

Resolves #39
twhl-community · Jan 23, 2022 · afea7bf · afea7bf
1 parent 5b77082
commit afea7bf
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 14 deletions.
diff --git a/dlls/crossbow.cpp b/dlls/crossbow.cpp
@@ -280,7 +280,7 @@ bool CCrossbow::GetItemInfo(ItemInfo* p)
 
 void CCrossbow::IncrementAmmo(CBasePlayer* pPlayer)
 {
-	if (pPlayer->GiveAmmo(1, "bolts", BOLT_MAX_CARRY) != 0)
+	if (pPlayer->GiveAmmo(1, "bolts", BOLT_MAX_CARRY) >= 0)
 	{
 		EMIT_SOUND(pPlayer->edict(), CHAN_STATIC, "ctf/pow_backpack.wav", 0.5, ATTN_NORM);
 	}

diff --git a/dlls/egon.cpp b/dlls/egon.cpp
@@ -112,7 +112,7 @@ bool CEgon::GetItemInfo(ItemInfo* p)
 
 void CEgon::IncrementAmmo(CBasePlayer* pPlayer)
 {
-	if (pPlayer->GiveAmmo(1, "uranium", URANIUM_MAX_CARRY) != 0)
+	if (pPlayer->GiveAmmo(1, "uranium", URANIUM_MAX_CARRY) >= 0)
 	{
 		EMIT_SOUND(pPlayer->edict(), CHAN_STATIC, "ctf/pow_backpack.wav", 0.5, ATTN_NORM);
 	}

diff --git a/dlls/gauss.cpp b/dlls/gauss.cpp
@@ -109,7 +109,7 @@ bool CGauss::GetItemInfo(ItemInfo* p)
 
 void CGauss::IncrementAmmo(CBasePlayer* pPlayer)
 {
-	if (pPlayer->GiveAmmo(1, "uranium", URANIUM_MAX_CARRY) != 0)
+	if (pPlayer->GiveAmmo(1, "uranium", URANIUM_MAX_CARRY) >= 0)
 	{
 		EMIT_SOUND(pPlayer->edict(), CHAN_STATIC, "ctf/pow_backpack.wav", 0.5, ATTN_NORM);
 	}

diff --git a/dlls/glock.cpp b/dlls/glock.cpp
@@ -74,7 +74,7 @@ bool CGlock::GetItemInfo(ItemInfo* p)
 
 void CGlock::IncrementAmmo(CBasePlayer* pPlayer)
 {
-	if (pPlayer->GiveAmmo(1, "9mm", _9MM_MAX_CARRY) != 0)
+	if (pPlayer->GiveAmmo(1, "9mm", _9MM_MAX_CARRY) >= 0)
 	{
 		EMIT_SOUND(pPlayer->edict(), CHAN_STATIC, "ctf/pow_backpack.wav", 0.5, ATTN_NORM);
 	}

diff --git a/dlls/handgrenade.cpp b/dlls/handgrenade.cpp
@@ -75,7 +75,7 @@ void CHandGrenade::IncrementAmmo(CBasePlayer* pPlayer)
 	}
 #endif
 
-	if (pPlayer->GiveAmmo(1, "Hand Grenade", HANDGRENADE_MAX_CARRY) != 0)
+	if (pPlayer->GiveAmmo(1, "Hand Grenade", HANDGRENADE_MAX_CARRY) >= 0)
 	{
 		EMIT_SOUND(pPlayer->edict(), CHAN_STATIC, "ctf/pow_backpack.wav", 0.5, ATTN_NORM);
 	}

diff --git a/dlls/mp5.cpp b/dlls/mp5.cpp
@@ -92,7 +92,7 @@ bool CMP5::GetItemInfo(ItemInfo* p)
 
 void CMP5::IncrementAmmo(CBasePlayer* pPlayer)
 {
-	if (pPlayer->GiveAmmo(1, "9mm", _9MM_MAX_CARRY) != 0)
+	if (pPlayer->GiveAmmo(1, "9mm", _9MM_MAX_CARRY) >= 0)
 	{
 		EMIT_SOUND(pPlayer->edict(), CHAN_STATIC, "ctf/pow_backpack.wav", 0.5, ATTN_NORM);
 	}

diff --git a/dlls/python.cpp b/dlls/python.cpp
@@ -44,7 +44,7 @@ bool CPython::GetItemInfo(ItemInfo* p)
 
 void CPython::IncrementAmmo(CBasePlayer* pPlayer)
 {
-	if (pPlayer->GiveAmmo(1, "357", _357_MAX_CARRY) != 0)
+	if (pPlayer->GiveAmmo(1, "357", _357_MAX_CARRY) >= 0)
 	{
 		EMIT_SOUND(pPlayer->edict(), CHAN_STATIC, "ctf/pow_backpack.wav", 0.5, ATTN_NORM);
 	}

diff --git a/dlls/rpg.cpp b/dlls/rpg.cpp
@@ -375,7 +375,7 @@ bool CRpg::GetItemInfo(ItemInfo* p)
 
 void CRpg::IncrementAmmo(CBasePlayer* pPlayer)
 {
-	if (pPlayer->GiveAmmo(1, "rockets", ROCKET_MAX_CARRY) != 0)
+	if (pPlayer->GiveAmmo(1, "rockets", ROCKET_MAX_CARRY) >= 0)
 	{
 		EMIT_SOUND(pPlayer->edict(), CHAN_STATIC, "ctf/pow_backpack.wav", 0.5, ATTN_NORM);
 	}

diff --git a/dlls/shotgun.cpp b/dlls/shotgun.cpp
@@ -98,7 +98,7 @@ bool CShotgun::GetItemInfo(ItemInfo* p)
 
 void CShotgun::IncrementAmmo(CBasePlayer* pPlayer)
 {
-	if (pPlayer->GiveAmmo(1, "buckshot", BUCKSHOT_MAX_CARRY) != 0)
+	if (pPlayer->GiveAmmo(1, "buckshot", BUCKSHOT_MAX_CARRY) >= 0)
 	{
 		EMIT_SOUND(pPlayer->edict(), CHAN_STATIC, "ctf/pow_backpack.wav", 0.5, ATTN_NORM);
 	}

diff --git a/dlls/weapons/CDisplacer.cpp b/dlls/weapons/CDisplacer.cpp
@@ -465,7 +465,7 @@ bool CDisplacer::GetItemInfo(ItemInfo* p)
 
 void CDisplacer::IncrementAmmo(CBasePlayer* pPlayer)
 {
-	if (pPlayer->GiveAmmo(1, "uranium", URANIUM_MAX_CARRY) != 0)
+	if (pPlayer->GiveAmmo(1, "uranium", URANIUM_MAX_CARRY) >= 0)
 	{
 		EMIT_SOUND(pPlayer->edict(), CHAN_STATIC, "ctf/pow_backpack.wav", 0.5, ATTN_NORM);
 	}

diff --git a/dlls/weapons/CEagle.cpp b/dlls/weapons/CEagle.cpp
@@ -349,7 +349,7 @@ bool CEagle::GetItemInfo(ItemInfo* p)
 
 void CEagle::IncrementAmmo(CBasePlayer* pPlayer)
 {
-	if (pPlayer->GiveAmmo(1, "357", _357_MAX_CARRY) != 0)
+	if (pPlayer->GiveAmmo(1, "357", _357_MAX_CARRY) >= 0)
 	{
 		EMIT_SOUND(pPlayer->edict(), CHAN_STATIC, "ctf/pow_backpack.wav", 0.5, ATTN_NORM);
 	}

diff --git a/dlls/weapons/CM249.cpp b/dlls/weapons/CM249.cpp
@@ -357,7 +357,7 @@ bool CM249::GetItemInfo(ItemInfo* p)
 
 void CM249::IncrementAmmo(CBasePlayer* pPlayer)
 {
-	if (pPlayer->GiveAmmo(1, "556", M249_MAX_CARRY) != 0)
+	if (pPlayer->GiveAmmo(1, "556", M249_MAX_CARRY) >= 0)
 	{
 		EMIT_SOUND(pPlayer->edict(), CHAN_STATIC, "ctf/pow_backpack.wav", 0.5, ATTN_NORM);
 	}

diff --git a/dlls/weapons/CSniperRifle.cpp b/dlls/weapons/CSniperRifle.cpp
@@ -234,7 +234,7 @@ bool CSniperRifle::GetItemInfo(ItemInfo* p)
 
 void CSniperRifle::IncrementAmmo(CBasePlayer* pPlayer)
 {
-	if (pPlayer->GiveAmmo(1, "762", SNIPERRIFLE_MAX_CARRY) != 0)
+	if (pPlayer->GiveAmmo(1, "762", SNIPERRIFLE_MAX_CARRY) >= 0)
 	{
 		EMIT_SOUND(pPlayer->edict(), CHAN_STATIC, "ctf/pow_backpack.wav", 0.5, ATTN_NORM);
 	}

diff --git a/dlls/weapons/CSporeLauncher.cpp b/dlls/weapons/CSporeLauncher.cpp
@@ -338,7 +338,7 @@ bool CSporeLauncher::GetItemInfo(ItemInfo* p)
 
 void CSporeLauncher::IncrementAmmo(CBasePlayer* pPlayer)
 {
-	if (pPlayer->GiveAmmo(1, "spores", SPORELAUNCHER_MAX_CARRY) != 0)
+	if (pPlayer->GiveAmmo(1, "spores", SPORELAUNCHER_MAX_CARRY) >= 0)
 	{
 		EMIT_SOUND(pPlayer->edict(), CHAN_STATIC, "ctf/pow_backpack.wav", 0.5, ATTN_NORM);
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -75,7 +75,7 @@ void CHandGrenade::IncrementAmmo(CBasePlayer* pPlayer) @@
     	}
     #endif
-    	if (pPlayer->GiveAmmo(1, "Hand Grenade", HANDGRENADE_MAX_CARRY) != 0)
+    	if (pPlayer->GiveAmmo(1, "Hand Grenade", HANDGRENADE_MAX_CARRY) >= 0)
     	{
     		EMIT_SOUND(pPlayer->edict(), CHAN_STATIC, "ctf/pow_backpack.wav", 0.5, ATTN_NORM);
     	}
@@ Expand Down @@