Remove MONSTER_SIZE_BROKEN (no longer needed)

diff --git a/qcsrc/common/monsters/monster.qh b/qcsrc/common/monsters/monster.qh
index aba9c9aa9b66713607aa3f2c4d02412744b82e51..632d9b65ded53312e87ed2085bdc9c769193ed57 100644 (file)
--- a/qcsrc/common/monsters/monster.qh
+++ b/qcsrc/common/monsters/monster.qh
@@ -4,7 +4,7 @@
 const int MONSTER_RESPAWN_DEATHPOINT = BIT(4); // re-spawn where we died
 const int MONSTER_TYPE_FLY = BIT(5);
 const int MONSTER_TYPE_SWIM = BIT(6);
-const int MONSTER_SIZE_BROKEN = BIT(7); // TODO: remove when bad models are replaced
+// bit 7 now unused
 const int MON_FLAG_SUPERMONSTER = BIT(8); // incredibly powerful monster
 const int MON_FLAG_RANGED = BIT(9); // monster shoots projectiles
 const int MON_FLAG_MELEE = BIT(10);

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index b97b5ccf6b385f3a2e5ab6361b118b01db60d889..ae36b7c053ca8619276bd211c5196c36163351f5 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -1404,15 +1404,8 @@ bool Monster_Spawn(entity this, bool check_appear, int mon_id)
                set_movetype(this, MOVETYPE_FLY);
        }
 
-       if(!(this.spawnflags & MONSTERFLAG_RESPAWNED))
-       {
-               if(mon.spawnflags & MONSTER_SIZE_BROKEN)
-                       this.scale *= 1.3;
-
-               if(mon.spawnflags & MONSTER_SIZE_QUAKE)
-               if(autocvar_g_monsters_quake_resize)
-                       this.scale *= 1.3;
-       }
+       if((mon.spawnflags & MONSTER_SIZE_QUAKE) && autocvar_g_monsters_quake_resize && !(this.spawnflags & MONSTERFLAG_RESPAWNED))
+               this.scale *= 1.3;
 
        setsize(this, mon.m_mins * this.scale, mon.m_maxs * this.scale);