From 49246b5b5696c63b766204056043305a13e2f887 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 12 Jun 2018 17:25:33 +1000 Subject: [PATCH] Remove an old note --- qcsrc/common/gamemodes/gamemode/invasion/invasion.qc | 4 ++-- qcsrc/common/monsters/sv_monsters.qc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qcsrc/common/gamemodes/gamemode/invasion/invasion.qc b/qcsrc/common/gamemodes/gamemode/invasion/invasion.qc index d6f9860c98..d308f5e169 100644 --- a/qcsrc/common/gamemodes/gamemode/invasion/invasion.qc +++ b/qcsrc/common/gamemodes/gamemode/invasion/invasion.qc @@ -138,8 +138,8 @@ Monster invasion_PickMonster(int supermonster_count) FOREACH(Monsters, it != MON_Null, { - if((it.spawnflags & MON_FLAG_HIDDEN) || (it.spawnflags & MONSTER_TYPE_PASSIVE) || (it.spawnflags & MONSTER_TYPE_FLY) || (it.spawnflags & MONSTER_TYPE_SWIM) || - (it.spawnflags & MONSTER_SIZE_QUAKE) || ((it.spawnflags & MON_FLAG_SUPERMONSTER) && supermonster_count >= 1)) + if((it.spawnflags & MON_FLAG_HIDDEN) || (it.spawnflags & MONSTER_TYPE_PASSIVE) || (it.spawnflags & MONSTER_TYPE_FLY) || (it.spawnflags & MONSTER_TYPE_SWIM) + || (it.spawnflags & MONSTER_SIZE_QUAKE) || ((it.spawnflags & MON_FLAG_SUPERMONSTER) && supermonster_count >= 1)) continue; if(autocvar_g_invasion_zombies_only && !(it.spawnflags & MONSTER_TYPE_UNDEAD)) continue; diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc index e762603d5b..6c44d2c15a 100644 --- a/qcsrc/common/monsters/sv_monsters.qc +++ b/qcsrc/common/monsters/sv_monsters.qc @@ -791,7 +791,7 @@ void Monster_Move(entity this, float runspeed, float walkspeed, float stpspeed) bool do_run = (this.enemy || this.monster_moveto); movelib_move_simple(this, v_forward, ((do_run) ? runspeed : walkspeed), 0.4); - if(time > this.pain_finished && time > this.anim_finished) // TODO: use anim_finished instead!? + if(time > this.pain_finished && time > this.anim_finished) if(!this.state) if(vdist(this.velocity, >, 10)) setanim(this, ((do_run) ? this.anim_run : this.anim_walk), true, false, false); -- 2.39.2