From: Mario <mario.mario@y7mail.com>
Date: Mon, 29 Jun 2020 12:39:56 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.5~7^2~1^2~19
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=83f281637f0f29ef570789200116efc8149fecbd;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/monsters
---

83f281637f0f29ef570789200116efc8149fecbd
diff --cc qcsrc/common/monsters/sv_monsters.qc
index 319b699a70,4c2b5ff269..bdd8e5159a
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@@ -101,7 -88,6 +101,7 @@@ bool Monster_ValidTarget(entity this, e
  	|| (this.monster_follow == targ || targ.monster_follow == this)
  	|| (!IS_VEHICLE(targ) && (targ.flags & FL_NOTARGET))
  	|| (!autocvar_g_monsters_typefrag && PHYS_INPUT_BUTTON_CHAT(targ))
- 	|| (IS_VEHICLE(targ) && !((Monsters_from(this.monsterid)).spawnflags & MON_FLAG_RANGED)) // melee vs vehicle is useless
++	|| (IS_VEHICLE(targ) && !((REGISTRY_GET(Monsters, this.monsterid)).spawnflags & MON_FLAG_RANGED)) // melee vs vehicle is useless
  	|| (SAME_TEAM(targ, this))
  	|| (STAT(FROZEN, targ))
  	|| (targ.alpha != 0 && targ.alpha < 0.5)