From 38719a21ceb95bc2b0ec30c393e60cdef215de4a Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 6 Apr 2013 18:58:07 +1100 Subject: [PATCH] Set monster waypoint height after changing the monster's scale --- qcsrc/server/monsters/lib/monsters.qc | 2 ++ qcsrc/server/monsters/monster/demon.qc | 2 +- qcsrc/server/monsters/monster/dog.qc | 2 +- qcsrc/server/monsters/monster/enforcer.qc | 2 +- qcsrc/server/monsters/monster/fish.qc | 2 +- qcsrc/server/monsters/monster/hknight.qc | 2 +- qcsrc/server/monsters/monster/knight.qc | 2 +- qcsrc/server/monsters/monster/ogre.qc | 2 +- qcsrc/server/monsters/monster/shalrath.qc | 2 +- qcsrc/server/monsters/monster/shambler.qc | 2 +- qcsrc/server/monsters/monster/soldier.qc | 2 +- qcsrc/server/monsters/monster/spawner.qc | 2 +- qcsrc/server/monsters/monster/spider.qc | 2 +- qcsrc/server/monsters/monster/tarbaby.qc | 2 +- qcsrc/server/monsters/monster/wizard.qc | 2 +- qcsrc/server/monsters/monster/zombie.qc | 2 +- 16 files changed, 17 insertions(+), 15 deletions(-) diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc index bf5e9cd55..0ef871258 100644 --- a/qcsrc/server/monsters/lib/monsters.qc +++ b/qcsrc/server/monsters/lib/monsters.qc @@ -697,6 +697,8 @@ void monster_hook_spawn() self.target2 = self.target; self.goalentity = find(world, targetname, self.target); } + + self.sprite_height *= self.scale; // do this after setting the monster's scale if(autocvar_g_monsters_healthbars) { diff --git a/qcsrc/server/monsters/monster/demon.qc b/qcsrc/server/monsters/monster/demon.qc index 7f0f4bc40..55d189a4f 100644 --- a/qcsrc/server/monsters/monster/demon.qc +++ b/qcsrc/server/monsters/monster/demon.qc @@ -95,7 +95,7 @@ void demon_spawn () self.nextthink = time + random() * 0.5 + 0.1; self.frame = demon_anim_stand; self.think = demon_think; - self.sprite_height = 30 * self.scale; + self.sprite_height = 30; monster_hook_spawn(); // for post-spawn mods } diff --git a/qcsrc/server/monsters/monster/dog.qc b/qcsrc/server/monsters/monster/dog.qc index 33f449a60..686ad510f 100644 --- a/qcsrc/server/monsters/monster/dog.qc +++ b/qcsrc/server/monsters/monster/dog.qc @@ -90,7 +90,7 @@ void dog_spawn () self.nextthink = time + random() * 0.5 + 0.1; self.think = dog_think; self.frame = dog_anim_idle; - self.sprite_height = 20 * self.scale; + self.sprite_height = 20; monster_hook_spawn(); // for post-spawn mods } diff --git a/qcsrc/server/monsters/monster/enforcer.qc b/qcsrc/server/monsters/monster/enforcer.qc index 0449aeaa2..432010b6c 100644 --- a/qcsrc/server/monsters/monster/enforcer.qc +++ b/qcsrc/server/monsters/monster/enforcer.qc @@ -136,7 +136,7 @@ void enforcer_spawn () self.nextthink = time + random() * 0.5 + 0.1; self.think = enforcer_think; self.items = (IT_SHELLS | IT_ROCKETS | IT_NAILS | IT_CELLS); - self.sprite_height = 45 * self.scale; + self.sprite_height = 45; self.weaponentity = spawn(); self.weaponentity.owner = self; diff --git a/qcsrc/server/monsters/monster/fish.qc b/qcsrc/server/monsters/monster/fish.qc index def58600d..31e74c691 100644 --- a/qcsrc/server/monsters/monster/fish.qc +++ b/qcsrc/server/monsters/monster/fish.qc @@ -60,7 +60,7 @@ void fish_spawn () self.flags |= FL_SWIM; self.nextthink = time + random() * 0.5 + 0.1; self.think = fish_think; - self.sprite_height = 20 * self.scale; + self.sprite_height = 20; monster_hook_spawn(); // for post-spawn mods } diff --git a/qcsrc/server/monsters/monster/hknight.qc b/qcsrc/server/monsters/monster/hknight.qc index 359049506..22333f1ae 100644 --- a/qcsrc/server/monsters/monster/hknight.qc +++ b/qcsrc/server/monsters/monster/hknight.qc @@ -432,7 +432,7 @@ void hellknight_spawn () self.attack_ranged = hknight_magic; self.nextthink = time + random() * 0.5 + 0.1; self.think = hellknight_think; - self.sprite_height = 30 * self.scale; + self.sprite_height = 30; self.frame = hellknight_anim_stand; monster_hook_spawn(); // for post-spawn mods diff --git a/qcsrc/server/monsters/monster/knight.qc b/qcsrc/server/monsters/monster/knight.qc index 64c3622ff..35ded60dd 100644 --- a/qcsrc/server/monsters/monster/knight.qc +++ b/qcsrc/server/monsters/monster/knight.qc @@ -68,7 +68,7 @@ void knight_spawn () self.attack_melee = knight_attack; self.nextthink = time + random() * 0.5 + 0.1; self.think = knight_think; - self.sprite_height = 30 * self.scale; + self.sprite_height = 30; self.frame = knight_anim_stand; monster_hook_spawn(); // for post-spawn mods diff --git a/qcsrc/server/monsters/monster/ogre.qc b/qcsrc/server/monsters/monster/ogre.qc index 868a15d51..ffa3aab05 100644 --- a/qcsrc/server/monsters/monster/ogre.qc +++ b/qcsrc/server/monsters/monster/ogre.qc @@ -154,7 +154,7 @@ void ogre_spawn () self.attack_ranged = ogre_missile; self.nextthink = time + 1; self.think = ogre_think; - self.sprite_height = 40 * self.scale; + self.sprite_height = 40; self.weapon = WEP_GRENADE_LAUNCHER; monster_hook_spawn(); // for post-spawn mods diff --git a/qcsrc/server/monsters/monster/shalrath.qc b/qcsrc/server/monsters/monster/shalrath.qc index 4a523ae48..6dcfb6172 100644 --- a/qcsrc/server/monsters/monster/shalrath.qc +++ b/qcsrc/server/monsters/monster/shalrath.qc @@ -213,7 +213,7 @@ void shalrath_spawn () self.nextthink = time + random() * 0.5 + 0.1; self.think = shalrath_think; self.frame = shalrath_anim_walk; - self.sprite_height = 40 * self.scale; + self.sprite_height = 40; monster_hook_spawn(); // for post-spawn mods } diff --git a/qcsrc/server/monsters/monster/shambler.qc b/qcsrc/server/monsters/monster/shambler.qc index 7125e48af..de1ff35d2 100644 --- a/qcsrc/server/monsters/monster/shambler.qc +++ b/qcsrc/server/monsters/monster/shambler.qc @@ -163,7 +163,7 @@ void shambler_spawn () self.nextthink = time + random() * 0.5 + 0.1; self.frame = shambler_anim_stand; self.think = shambler_think; - self.sprite_height = 70 * self.scale; + self.sprite_height = 70; self.weapon = WEP_NEX; monster_hook_spawn(); // for post-spawn mods diff --git a/qcsrc/server/monsters/monster/soldier.qc b/qcsrc/server/monsters/monster/soldier.qc index 474706759..89d56ba89 100644 --- a/qcsrc/server/monsters/monster/soldier.qc +++ b/qcsrc/server/monsters/monster/soldier.qc @@ -274,7 +274,7 @@ void soldier_spawn () self.frame = soldier_anim_draw; self.nextthink = time + random() * 0.5 + 0.1; self.think = soldier_think; - self.sprite_height = 45 * self.scale; + self.sprite_height = 45; self.items = (IT_SHELLS | IT_ROCKETS | IT_NAILS); RandomSelection_Init(); diff --git a/qcsrc/server/monsters/monster/spawner.qc b/qcsrc/server/monsters/monster/spawner.qc index d7a5ca2b1..1e984f53b 100644 --- a/qcsrc/server/monsters/monster/spawner.qc +++ b/qcsrc/server/monsters/monster/spawner.qc @@ -94,7 +94,7 @@ void spawner_spawn() self.velocity = '0 0 0'; self.think = spawner_think; self.touch = func_null; - self.sprite_height = 80 * self.scale; + self.sprite_height = 80; self.spawner_monstercount = 0; diff --git a/qcsrc/server/monsters/monster/spider.qc b/qcsrc/server/monsters/monster/spider.qc index 6e88618ff..4bb0eb599 100644 --- a/qcsrc/server/monsters/monster/spider.qc +++ b/qcsrc/server/monsters/monster/spider.qc @@ -181,7 +181,7 @@ void spider_spawn() self.attack_melee = spider_attack_standing; self.attack_ranged = spider_attack_ranged; self.think = spider_think; - self.sprite_height = 40 * self.scale; + self.sprite_height = 40; monster_hook_spawn(); // for post-spawn mods } diff --git a/qcsrc/server/monsters/monster/tarbaby.qc b/qcsrc/server/monsters/monster/tarbaby.qc index 414860cdd..811605789 100644 --- a/qcsrc/server/monsters/monster/tarbaby.qc +++ b/qcsrc/server/monsters/monster/tarbaby.qc @@ -117,7 +117,7 @@ void tarbaby_spawn () self.attack_melee = tarbaby_jump; self.nextthink = time + random() * 0.5 + 0.1; self.think = tarbaby_think; - self.sprite_height = 20 * self.scale; + self.sprite_height = 20; self.frame = tarbaby_anim_walk; monster_hook_spawn(); // for post-spawn mods diff --git a/qcsrc/server/monsters/monster/wizard.qc b/qcsrc/server/monsters/monster/wizard.qc index 31d826725..97842688a 100644 --- a/qcsrc/server/monsters/monster/wizard.qc +++ b/qcsrc/server/monsters/monster/wizard.qc @@ -143,7 +143,7 @@ void wizard_spawn () self.movetype = MOVETYPE_FLY; // TODO: make it fly up/down self.flags |= FL_FLY; self.think = wizard_think; - self.sprite_height = 30 * self.scale; + self.sprite_height = 30; monster_hook_spawn(); // for post-spawn mods } diff --git a/qcsrc/server/monsters/monster/zombie.qc b/qcsrc/server/monsters/monster/zombie.qc index 257417515..8a5131ad7 100644 --- a/qcsrc/server/monsters/monster/zombie.qc +++ b/qcsrc/server/monsters/monster/zombie.qc @@ -164,7 +164,7 @@ void zombie_spawn() self.nextthink = time + 2.1; self.frame = zombie_anim_spawn; self.think = zombie_think; - self.sprite_height = 50 * self.scale; + self.sprite_height = 50; self.checkattack = GenericCheckAttack; self.attack_melee = zombie_attack_standing; self.attack_ranged = zombie_attack_ranged; -- 2.39.2