Merge branch 'terencehill/auto-balanced_bots' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / tests.qc

diff --git a/qcsrc/server/tests.qc b/qcsrc/server/tests.qc
index 388c4af7b83d57ea13120fb7afb824f98d485026..2f7dc88ba1436fffc693778aba98ddcdfad4100e 100644 (file)
--- a/qcsrc/server/tests.qc
+++ b/qcsrc/server/tests.qc
@@ -2,7 +2,7 @@
 
 void test_weapons_hurt(entity this)
 {
-    EXPECT_NE(100, this.health);
+    EXPECT_NE(100, GetResource(this, RES_HEALTH));
     delete(this.enemy);
     delete(this);
 }
@@ -25,9 +25,8 @@ TEST(Weapons, Hurt)
     PHYS_INPUT_BUTTON_ATCK(it) = true;
     it.items |= IT_UNLIMITED_AMMO;
     Weapon wep = WEP_VORTEX;
-    .entity weaponentity = weaponentities[0]; // TODO: unhardcode
     W_GiveWeapon(it, wep.m_id);
-    W_SwitchWeapon_Force(it, wep, weaponentity);
+    W_SwitchWeapon_Force(it, wep, weaponentities[0]);
 
     it = b;
     PHYS_INPUT_BUTTON_JUMP(it) = true;