X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fresources.qc;h=4ff31c3c066e191341a231836075eebc683c84a9;hp=b894d6d1f74fab6af9726230d62154e57c7b9e5c;hb=5d929ee0b1dc587e3154a4fa4b56e83b9ba9100b;hpb=3fc2359b7933352424af07db8f84cbb9342e934f

diff --git a/qcsrc/server/resources.qc b/qcsrc/server/resources.qc
index b894d6d1f7..4ff31c3c06 100644
--- a/qcsrc/server/resources.qc
+++ b/qcsrc/server/resources.qc
@@ -71,14 +71,14 @@ float GetResourceLimit(entity e, int res_type)
 	return limit;
 }
 
-float GetResourceAmount(entity e, int res_type)
+float GetResource(entity e, int res_type)
 {
 	return e.(GetResourceField(res_type));
 }
 
-void SetResourceAmount(entity e, int res_type, float amount)
+void SetResource(entity e, int res_type, float amount)
 {
-	bool forbid = MUTATOR_CALLHOOK(SetResourceAmount, e, res_type, amount);
+	bool forbid = MUTATOR_CALLHOOK(SetResource, e, res_type, amount);
 	if (forbid)
 	{
 		return;
@@ -122,7 +122,7 @@ void GiveResource(entity receiver, int res_type, float amount)
 	{
 		return;
 	}
-	SetResourceAmount(receiver, res_type, GetResourceAmount(receiver, res_type) + amount);
+	SetResource(receiver, res_type, GetResource(receiver, res_type) + amount);
 	switch (res_type)
 	{
 		case RES_HEALTH:
@@ -166,7 +166,7 @@ void GiveResourceWithLimit(entity receiver, int res_type, float amount, float li
 	{
 		return;
 	}
-	float current_amount = GetResourceAmount(receiver, res_type);
+	float current_amount = GetResource(receiver, res_type);
 	if (current_amount + amount > limit && limit != RES_LIMIT_NONE)
 	{
 		amount = limit - current_amount;
@@ -191,7 +191,7 @@ void TakeResource(entity receiver, int res_type, float amount)
 	{
 		return;
 	}
-	SetResourceAmount(receiver, res_type, GetResourceAmount(receiver, res_type) - amount);
+	SetResource(receiver, res_type, GetResource(receiver, res_type) - amount);
 }
 
 void TakeResourceWithLimit(entity receiver, int res_type, float amount, float limit)
@@ -212,7 +212,7 @@ void TakeResourceWithLimit(entity receiver, int res_type, float amount, float li
 	{
 		return;
 	}
-	float current_amount = GetResourceAmount(receiver, res_type);
+	float current_amount = GetResource(receiver, res_type);
 	if (current_amount - amount < -limit)
 	{
 		amount = -limit + current_amount;