From e5943f34e2b8f92804802bbc1e41ab78a4803507 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 27 Jun 2017 22:57:30 +1000 Subject: [PATCH] Remove MONSTER_SIZE_BROKEN (no longer needed) --- qcsrc/common/monsters/monster.qh | 2 +- qcsrc/common/monsters/sv_monsters.qc | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/qcsrc/common/monsters/monster.qh b/qcsrc/common/monsters/monster.qh index aba9c9aa9b..632d9b65de 100644 --- 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 b97b5ccf6b..ae36b7c053 100644 --- 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); -- 2.39.2