From: terencehill <piuntn@gmail.com>
Date: Fri, 22 Feb 2019 17:58:22 +0000 (+0100)
Subject: Get rid of 2 functions
X-Git-Tag: xonotic-v0.8.5~1592
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fca97ea0245c170ddac8093b76b5d5ac60fd8f91;p=xonotic%2Fxonotic-data.pk3dir.git

Get rid of 2 functions
---

diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index 30d90faaf..bce35c7dd 100644
--- a/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@ -746,14 +746,20 @@ bool Item_GiveAmmoTo(entity item, entity player, int res_type, float ammomax)
 		{
 			return false;
 		}
-		GiveOrTakeResourceWithLimit(player, res_type, amount, ammomax);
+		if (amount < 0)
+			TakeResourceWithLimit(player, res_type, -amount, ammomax);
+		else
+			GiveResourceWithLimit(player, res_type, amount, ammomax);
 		return true;
 	}
 	if (g_weapon_stay != 2)
 	{
 		return false;
 	}
-	GiveOrTakeResourceWithLimit(player, res_type, amount, min(amount, ammomax));
+	if (amount < 0)
+		TakeResourceWithLimit(player, res_type, -amount, min(amount, ammomax));
+	else
+		GiveResourceWithLimit(player, res_type, amount, min(amount, ammomax));
 	return true;
 }
 
diff --git a/qcsrc/server/resources.qc b/qcsrc/server/resources.qc
index 6e63b2e3e..e36eb5750 100644
--- a/qcsrc/server/resources.qc
+++ b/qcsrc/server/resources.qc
@@ -230,30 +230,6 @@ void TakeResourceWithLimit(entity receiver, int res_type, float amount, float li
 	TakeResource(receiver, res_type, amount);
 }
 
-void GiveOrTakeResource(entity receiver, int res_type, float amount)
-{
-	if(amount < 0)
-	{
-		TakeResource(receiver, res_type, amount * -1);
-	}
-	else
-	{
-		GiveResource(receiver, res_type, amount);
-	}
-}
-
-void GiveOrTakeResourceWithLimit(entity receiver, int res_type, float amount, float limit)
-{
-	if(amount < 0)
-	{
-		TakeResourceWithLimit(receiver, res_type, amount * -1, limit);
-	}
-	else
-	{
-		GiveResourceWithLimit(receiver, res_type, amount, limit);
-	}
-}
-
 int GetResourceType(.float res_field)
 {
 	switch (res_field)
diff --git a/qcsrc/server/resources.qh b/qcsrc/server/resources.qh
index 149ef9b88..c228b6ec4 100644
--- a/qcsrc/server/resources.qh
+++ b/qcsrc/server/resources.qh
@@ -66,21 +66,6 @@ void TakeResource(entity receiver, int res_type, float amount);
 /// \return No return.
 void TakeResourceWithLimit(entity receiver, int res_type, float amount, float limit);
 
-/// \brief Gives to or takes from an entity resource.
-/// \param[in,out] receiver Entity to give or take resource.
-/// \param[in] res_type Type of the resource (a RES_* constant).
-/// \param[in] amount Amount of resource to give or take.
-/// \return No return.
-void GiveOrTakeResource(entity receiver, int res_type, float amount);
-
-/// \brief Gives to or takes from an entity resource but not more/less than a limit.
-/// \param[in,out] receiver Entity to give or take resource.
-/// \param[in] res_type Type of the resource (a RES_* constant).
-/// \param[in] amount Amount of resource to give or take.
-/// \param[in] limit Limit of resources to give or take.
-/// \return No return.
-void GiveOrTakeResourceWithLimit(entity receiver, int res_type, float amount, float limit);
-
 // ===================== Legacy and/or internal API ===========================
 
 /// \brief Converts an entity field to resource type.