X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fdefault%2Fscripting.qc;h=176b6361de30bb83ca0870475a3b49b00bfab804;hp=48975b8367e58766668e59027e5e73000b9b4d51;hb=797bf448a96c0c13d783c7c919bb2caf6fa16707;hpb=4096ab0591cbd7fac803e022375cd3c221511d8b

diff --git a/qcsrc/server/bot/default/scripting.qc b/qcsrc/server/bot/default/scripting.qc
index 48975b8367..176b6361de 100644
--- a/qcsrc/server/bot/default/scripting.qc
+++ b/qcsrc/server/bot/default/scripting.qc
@@ -624,7 +624,7 @@ float bot_cmd_eval(entity this, string expr)
 	switch(expr)
 	{
 		case "health":
-			return GetResourceAmount(this, RESOURCE_HEALTH);
+			return GetResource(this, RES_HEALTH);
 		case "speed":
 			return vlen(this.velocity);
 		case "flagcarrier":
@@ -1084,12 +1084,12 @@ float bot_cmd_debug_assert_canfire(entity this)
 			LOG_INFO("Bot ", this.netname, " using ", this.(weaponentity).weaponname, " wants to fire, inhibited by weaponentity state");
 		}
 	}
-	else if(ATTACK_FINISHED(this, slot) > time)
+	else if(ATTACK_FINISHED(this, weaponentity) > time)
 	{
 		if(f)
 		{
 			this.colormod = '8 0 8';
-			LOG_INFO("Bot ", this.netname, " using ", this.(weaponentity).weaponname, " wants to fire, inhibited by ATTACK_FINISHED (", ftos(ATTACK_FINISHED(this, slot) - time), " seconds left)");
+			LOG_INFO("Bot ", this.netname, " using ", this.(weaponentity).weaponname, " wants to fire, inhibited by ATTACK_FINISHED (", ftos(ATTACK_FINISHED(this, weaponentity) - time), " seconds left)");
 		}
 	}
 	else if(this.(weaponentity).tuba_note)
@@ -1105,7 +1105,7 @@ float bot_cmd_debug_assert_canfire(entity this)
 		if(!f)
 		{
 			this.colormod = '8 8 0';
-			LOG_INFO("Bot ", this.netname, " using ", this.(weaponentity).weaponname, " thinks it has fired, but apparently did not; ATTACK_FINISHED says ", ftos(ATTACK_FINISHED(this, slot) - time), " seconds left");
+			LOG_INFO("Bot ", this.netname, " using ", this.(weaponentity).weaponname, " thinks it has fired, but apparently did not; ATTACK_FINISHED says ", ftos(ATTACK_FINISHED(this, weaponentity) - time), " seconds left");
 		}
 	}