X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fresources.qc;h=74a0c55788a71a2f19de6accaeaacba47f1c9c3b;hb=fc0889be210898f9a72b4e12ddf30e2ae5effa24;hp=4ad66bb98ed2169380e7074ea23147a503e652cf;hpb=d01c567581179df7cc68bcdc8dce58efad911bc4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/resources.qc b/qcsrc/server/resources.qc
index 4ad66bb98..74a0c5578 100644
--- a/qcsrc/server/resources.qc
+++ b/qcsrc/server/resources.qc
@@ -10,6 +10,9 @@
 
 float GetResourceLimit(entity e, int resource_type)
 {
+	if(!IS_PLAYER(e))
+		return RESOURCE_LIMIT_NONE; // no limits on non-players
+
 	float limit;
 	switch (resource_type)
 	{
@@ -74,6 +77,17 @@ float GetResourceAmount(entity e, int resource_type)
 	return e.(resource_field);
 }
 
+bool SetResourceAmountExplicit(entity e, int resource_type, float amount)
+{
+	.float resource_field = GetResourceField(resource_type);
+	if (e.(resource_field) != amount)
+	{
+		e.(resource_field) = amount;
+		return true;
+	}
+	return false;
+}
+
 void SetResourceAmount(entity e, int resource_type, float amount)
 {
 	bool forbid = MUTATOR_CALLHOOK(SetResourceAmount, e, resource_type, amount);
@@ -83,17 +97,16 @@ void SetResourceAmount(entity e, int resource_type, float amount)
 	}
 	resource_type = M_ARGV(1, int);
 	amount = M_ARGV(2, float);
-	float max_amount = GetResourceLimit(e, resource_type);
+	float max_amount = GetResourceLimit(e, resource_type); // TODO: should allow overriding these limits if cheats are enabled!
 	float amount_wasted = 0;
-	if (amount > max_amount)
+	if (amount > max_amount && max_amount != RESOURCE_LIMIT_NONE)
 	{
 		amount_wasted = amount - max_amount;
 		amount = max_amount;
 	}
-	.float resource_field = GetResourceField(resource_type);
-	if (e.(resource_field) != amount)
+	bool changed = SetResourceAmountExplicit(e, resource_type, amount);
+	if (changed)
 	{
-		e.(resource_field) = amount;
 		MUTATOR_CALLHOOK(ResourceAmountChanged, e, resource_type, amount);
 	}
 	if (amount_wasted == 0)
@@ -105,7 +118,7 @@ void SetResourceAmount(entity e, int resource_type, float amount)
 
 void GiveResource(entity receiver, int resource_type, float amount)
 {
-	if (amount == 0)
+	if (amount <= 0)
 	{
 		return;
 	}
@@ -151,7 +164,7 @@ void GiveResource(entity receiver, int resource_type, float amount)
 void GiveResourceWithLimit(entity receiver, int resource_type, float amount,
 	float limit)
 {
-	if (amount == 0)
+	if (amount <= 0)
 	{
 		return;
 	}
@@ -164,18 +177,93 @@ void GiveResourceWithLimit(entity receiver, int resource_type, float amount,
 	resource_type = M_ARGV(1, int);
 	amount = M_ARGV(2, float);
 	limit = M_ARGV(3, float);
-	if (amount == 0)
+	if (amount <= 0)
 	{
 		return;
 	}
 	float current_amount = GetResourceAmount(receiver, resource_type);
-	if (current_amount + amount > limit)
+	if (current_amount + amount > limit && limit != RESOURCE_LIMIT_NONE)
 	{
 		amount = limit - current_amount;
 	}
 	GiveResource(receiver, resource_type, amount);
 }
 
+void TakeResource(entity receiver, int resource_type, float amount)
+{
+	if (amount <= 0)
+	{
+		return;
+	}
+	bool forbid = MUTATOR_CALLHOOK(TakeResource, receiver, resource_type,
+		amount);
+	if (forbid)
+	{
+		return;
+	}
+	resource_type = M_ARGV(1, int);
+	amount = M_ARGV(2, float);
+	if (amount <= 0)
+	{
+		return;
+	}
+	SetResourceAmount(receiver, resource_type,
+		GetResourceAmount(receiver, resource_type) - amount);
+}
+
+void TakeResourceWithLimit(entity receiver, int resource_type, float amount,
+	float limit)
+{
+	if (amount <= 0)
+	{
+		return;
+	}
+	bool forbid = MUTATOR_CALLHOOK(TakeResourceWithLimit, receiver,
+		resource_type, amount, limit);
+	if (forbid)
+	{
+		return;
+	}
+	resource_type = M_ARGV(1, int);
+	amount = M_ARGV(2, float);
+	limit = M_ARGV(3, float);
+	if (amount <= 0)
+	{
+		return;
+	}
+	float current_amount = GetResourceAmount(receiver, resource_type);
+	if (current_amount - amount < -limit)
+	{
+		amount = -limit + current_amount;
+	}
+	TakeResource(receiver, resource_type, amount);
+}
+
+void GiveOrTakeResource(entity receiver, int resource_type, float amount)
+{
+	if(amount < 0)
+	{
+		TakeResource(receiver, resource_type, amount * -1);
+	}
+	else
+	{
+		GiveResource(receiver, resource_type, amount);
+	}
+}
+
+void GiveOrTakeResourceWithLimit(entity receiver, int resource_type, float amount,
+	float limit)
+{
+	if(amount < 0)
+	{
+		TakeResourceWithLimit(receiver, resource_type, amount * -1, limit);
+	}
+	else
+	{
+		GiveResourceWithLimit(receiver, resource_type, amount, limit);
+	}
+}
+
 int GetResourceType(.float resource_field)
 {
 	switch (resource_field)