Merge branch 'master' into Mario/monsters

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / monsters / monster / troll.qh

diff --git a/qcsrc/common/monsters/monster/troll.qh b/qcsrc/common/monsters/monster/troll.qh
index df6188db7d4094bc4e034b640461f8f12f33892e..d5cc1f37a407861ad1269dd2ddd7817801906bd0 100644 (file)
--- a/qcsrc/common/monsters/monster/troll.qh
+++ b/qcsrc/common/monsters/monster/troll.qh
@@ -12,8 +12,8 @@ MODEL(MON_TROLL, M_Model("troll.dpm"));
 
 CLASS(Troll, Monster)
     ATTRIB(Troll, spawnflags, int, MON_FLAG_SUPERMONSTER | MON_FLAG_MELEE);
-    ATTRIB(Troll, mins, vector, '-45 -45 -24');
-    ATTRIB(Troll, maxs, vector, '45 45 160');
+    ATTRIB(Troll, m_mins, vector, '-45 -45 -24');
+    ATTRIB(Troll, m_maxs, vector, '45 45 160');
 #ifdef GAMEQC
     ATTRIB(Troll, m_model, Model, MDL_MON_TROLL);
 #endif
@@ -21,8 +21,4 @@ CLASS(Troll, Monster)
     ATTRIB(Troll, monster_name, string, _("Troll"));
 ENDCLASS(Troll)
 
-REGISTER_MONSTER(TROLL, NEW(Troll)) {
-#ifdef GAMEQC
-    this.mr_precache(this);
-#endif
-}
+REGISTER_MONSTER(TROLL, NEW(Troll));