Set monster waypoint height after changing the monster's scale

diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index bf5e9cd559fa83001170b58f4350e3e21331a9e3..0ef8712586c9d5dfd065638dc48bd633bec7d1db 100644 (file)
--- 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 7f0f4bc40053261b974ce587a6db1e59f7285feb..55d189a4fb7b7585fa2aecb5a7ce5a9bde814294 100644 (file)
--- 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 33f449a609f4a545252e2c51f113b064fc62d81e..686ad510fa62f94223e06849d55a0b5f4ef7742c 100644 (file)
--- 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 0449aeaa2c46e11238ea7a2bad238b1757c8225b..432010b6c40b7850a8b0be0fdf58804916b63853 100644 (file)
--- 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 def58600db9b38e29973fe56dec21f841545a14c..31e74c6916c4aa0776812e589ef35c30a3f6d46f 100644 (file)
--- 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 359049506ce01639082f2b51e7d5c7503ef884a6..22333f1aef58f6283bb1e17af7a2d4add07061f6 100644 (file)
--- 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 64c3622ffde628c54f4ed1a0e37d4791902ee62b..35ded60ddd21e5370a13b9327108280f34df0eab 100644 (file)
--- 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 868a15d51a22a030a5495eb1fe794bba6e1fa776..ffa3aab051e4184fdab4d78323306f66a02c8f62 100644 (file)
--- 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 4a523ae48b05e48a1e44ebdad9bfd43f7bbf6280..6dcfb61726e2ee557db34c0749c8dfc0c8256d57 100644 (file)
--- 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 7125e48af543c2dac5a116651fe55f1a9d75b874..de1ff35d2b7c9bd1d8c8cd0909b665d6e0d088da 100644 (file)
--- 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 47470675979db7fa1332c1829f3eabfba39fe32d..89d56ba89b36b94ff096d7d9f1f9a8fc6a6ed81a 100644 (file)
--- 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 d7a5ca2b119777313a29f4e700c8ce530edcd9a3..1e984f53b894a0aaf10b9fec7208e66370c3a28b 100644 (file)
--- 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 6e88618ff21d0836bac43408bfea93ad51b0a9d4..4bb0eb59949a9e0e3e111a07481ae3c5f12e3872 100644 (file)
--- 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 414860cdd22db2e6c04a594cffb2a5b2c9931942..81160578908b81e5591d1460c2256ba2390aeafc 100644 (file)
--- 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 31d826725fb8465d754e763135b9f3b4d3a2910b..97842688a38b981865e1c6ad369d1003270d8396 100644 (file)
--- 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 2574175159f3c57585c98dabe66256568f16a8d1..8a5131ad7ce441c255395363810f79922fd5722f 100644 (file)
--- 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;