Remove sprite_height

diff --git a/qcsrc/server/monsters/lib/defs.qh b/qcsrc/server/monsters/lib/defs.qh
index 79d3903d83ca44c7820ef516e3ce6eacccb543cf..9acf68d740133550dbfd2786267d467c56f06ba3 100644 (file)
--- a/qcsrc/server/monsters/lib/defs.qh
+++ b/qcsrc/server/monsters/lib/defs.qh
@@ -1,5 +1,3 @@
-.float sprite_height;
-
 .void()                attack_melee;
 .float()       attack_ranged;
 .float()       checkattack;

diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index c125157cc1bab1568fe94593e029aec49b65e462..c644252f5b847052da220dfcdc003ecbe34559d4 100644 (file)
--- a/qcsrc/server/monsters/lib/monsters.qc
+++ b/qcsrc/server/monsters/lib/monsters.qc
@@ -907,12 +907,10 @@ void monster_hook_spawn()
        
        if(teamplay)
                self.monster_attack = TRUE; // we can have monster enemies in team games
-       
-       self.sprite_height *= self.scale; // do this after setting the monster's scale
                
        if(autocvar_g_monsters_healthbars)
        {
-               WaypointSprite_Spawn(nname, 0, 600, self, '0 0 1' * self.sprite_height, world, 0, self, sprite, FALSE, RADARICON_DANGER, ((self.team) ? Team_ColorRGB(self.team) : '1 0 0'));   
+               WaypointSprite_Spawn(nname, 0, 600, self, '0 0 1' * (self.maxs_z + 15), world, 0, self, sprite, FALSE, RADARICON_DANGER, ((self.team) ? Team_ColorRGB(self.team) : '1 0 0'));   
                WaypointSprite_UpdateMaxHealth(self.sprite, self.max_health);
                WaypointSprite_UpdateHealth(self.sprite, self.health);
        }

diff --git a/qcsrc/server/monsters/monster/demon.qc b/qcsrc/server/monsters/monster/demon.qc
index e1a0383d1348d579f4b19b6892187633df117928..e60a26b433b28788e5f9bee14209eb4c8afdaded 100644 (file)
--- a/qcsrc/server/monsters/monster/demon.qc
+++ b/qcsrc/server/monsters/monster/demon.qc
@@ -95,7 +95,6 @@ void demon_spawn ()
        self.attack_ranged              = demon_jump;
        self.nextthink                  = time + random() * 0.5 + 0.1;
        self.think                              = demon_think;
-       self.sprite_height              = 30;
        
        monsters_setframe(demon_anim_stand);
        

diff --git a/qcsrc/server/monsters/monster/dog.qc b/qcsrc/server/monsters/monster/dog.qc
index dcee7649a5d5d05db3050e9d69169b282ee49e65..fbf82b2df8069d16c817f1b69035ec1f1b9cfad8 100644 (file)
--- a/qcsrc/server/monsters/monster/dog.qc
+++ b/qcsrc/server/monsters/monster/dog.qc
@@ -90,7 +90,7 @@ void dog_spawn ()
        self.checkattack                = GenericCheckAttack;
        self.nextthink                  = time + random() * 0.5 + 0.1;
        self.think                              = dog_think;
-       self.sprite_height              = 20;
+       
        monsters_setframe(dog_anim_idle);
        
        monster_setupsounds("dog");

diff --git a/qcsrc/server/monsters/monster/fish.qc b/qcsrc/server/monsters/monster/fish.qc
index 463315db5f4dda74e8893af6447daaf9323be46e..f5c15f5e398493810539d7106f9e4824ac5c5443 100644 (file)
--- a/qcsrc/server/monsters/monster/fish.qc
+++ b/qcsrc/server/monsters/monster/fish.qc
@@ -62,7 +62,6 @@ void fish_spawn ()
        self.flags                         |= FL_SWIM;
        self.nextthink                  = time + random() * 0.5 + 0.1;
        self.think                              = fish_think;
-       self.sprite_height              = 20;
        
        monster_setupsounds("fish");
        

diff --git a/qcsrc/server/monsters/monster/hknight.qc b/qcsrc/server/monsters/monster/hknight.qc
index 4397efb2141e035e4e73f1922634473178fd0509..498d5c10233933c737bc2424b795924f2cc2272d 100644 (file)
--- a/qcsrc/server/monsters/monster/hknight.qc
+++ b/qcsrc/server/monsters/monster/hknight.qc
@@ -430,7 +430,6 @@ void hellknight_spawn ()
        self.attack_ranged              = hknight_magic;
        self.nextthink                  = time + random() * 0.5 + 0.1;
        self.think                              = hellknight_think;
-       self.sprite_height              = 30;
        
        monsters_setframe(hellknight_anim_stand);
        

diff --git a/qcsrc/server/monsters/monster/knight.qc b/qcsrc/server/monsters/monster/knight.qc
index 064b25207e021c9326049885d7ee4acdf80b9979..17b38658db95482fb4e039fb5d8b8f3898044c51 100644 (file)
--- a/qcsrc/server/monsters/monster/knight.qc
+++ b/qcsrc/server/monsters/monster/knight.qc
@@ -71,8 +71,6 @@ 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.view_ofs              *= 0.5;
        
        monsters_setframe(knight_anim_stand);
        

diff --git a/qcsrc/server/monsters/monster/ogre.qc b/qcsrc/server/monsters/monster/ogre.qc
index 1feb98daa3c8b482287383fbb8c2abe04eaa7991..d928527578a8ca86ae9e35d60782e38b65f4390f 100644 (file)
--- a/qcsrc/server/monsters/monster/ogre.qc
+++ b/qcsrc/server/monsters/monster/ogre.qc
@@ -231,14 +231,13 @@ void ogre_spawn()
        if not(self.health)
                self.health = autocvar_g_monster_ogre_health * self.scale;
 
-       self.damageforcescale   = 0.003;
+       self.damageforcescale   = 0.003;
        self.classname                  = "monster_ogre";
-       self.checkattack                = GenericCheckAttack;
+       self.checkattack                = GenericCheckAttack;
        self.attack_melee               = ogre_melee;
-       self.attack_ranged              = ogre_missile;
-       self.nextthink                  = time + 0.1;
-       self.think                              = ogre_think;
-       self.sprite_height              = 65;
+       self.attack_ranged              = ogre_missile;
+       self.nextthink                  = time + 0.1;
+       self.think                              = ogre_think;
        self.weapon                             = WEP_GRENADE_LAUNCHER;
        
        monsters_setframe(ogre_anim_idle);

diff --git a/qcsrc/server/monsters/monster/shalrath.qc b/qcsrc/server/monsters/monster/shalrath.qc
index 7f4554720dc41406e245b068325d02abb40fc363..ee4c1f99b24376e97382ae7a75a817daf8da5d99 100644 (file)
--- a/qcsrc/server/monsters/monster/shalrath.qc
+++ b/qcsrc/server/monsters/monster/shalrath.qc
@@ -271,7 +271,6 @@ void shalrath_spawn ()
        self.attack_melee               = shalrath_attack_melee;
        self.nextthink                  = time + random() * 0.5 + 0.1;
        self.think                              = shalrath_think;
-       self.sprite_height              = 65;
        
        monsters_setframe(shalrath_anim_walk);
        

diff --git a/qcsrc/server/monsters/monster/shambler.qc b/qcsrc/server/monsters/monster/shambler.qc
index 44f1f9b998e5c64aee71a5d8f057d51d85ab6341..3fa9b64014b1acae56cee73ff5d1757b6192ea5d 100644 (file)
--- a/qcsrc/server/monsters/monster/shambler.qc
+++ b/qcsrc/server/monsters/monster/shambler.qc
@@ -1,7 +1,7 @@
 #ifndef MENUQC
 // size
 const vector SHAMBLER_MIN = '-32 -32 -24';
-const vector SHAMBLER_MAX = '32 32 64';
+const vector SHAMBLER_MAX = '32 32 50';
 
 // model
 string SHAMBLER_MODEL = "models/monsters/shambler.mdl";
@@ -163,7 +163,6 @@ void shambler_spawn ()
        self.attack_ranged              = sham_lightning;
        self.nextthink                  = time + random() * 0.5 + 0.1;
        self.think                              = shambler_think;
-       self.sprite_height              = 70;
        self.weapon                             = WEP_NEX;
        
        monsters_setframe(shambler_anim_stand);

diff --git a/qcsrc/server/monsters/monster/soldier.qc b/qcsrc/server/monsters/monster/soldier.qc
index 7c3727f6bf2276bc1a5fd76de2f9958970c86713..6c23bbb5899417bfe32eef46c4b6df2260e35853 100644 (file)
--- a/qcsrc/server/monsters/monster/soldier.qc
+++ b/qcsrc/server/monsters/monster/soldier.qc
@@ -1,7 +1,7 @@
 #ifndef MENUQC
 // size
 const vector SOLDIER_MIN = '-16 -16 -30';
-const vector SOLDIER_MAX = '16 16 32';
+const vector SOLDIER_MAX = '16 16 24';
 
 // model
 string SOLDIER_MODEL = "models/monsters/soldier.zym";
@@ -322,7 +322,6 @@ void soldier_spawn ()
        self.nextthink                  = time + random() * 0.5 + 0.1;
        self.think                              = soldier_think;
        self.currentammo                = 3;
-       self.sprite_height              = 45;
        self.items                              = (IT_SHELLS | IT_ROCKETS | IT_NAILS);
        
        monsters_setframe(soldier_anim_draw);

diff --git a/qcsrc/server/monsters/monster/spider.qc b/qcsrc/server/monsters/monster/spider.qc
index e94ecc71e5505976ebe6313ddbf6162e1425a83e..b21b153d06c793f2c01394417f4e9de9f67c1bae 100644 (file)
--- a/qcsrc/server/monsters/monster/spider.qc
+++ b/qcsrc/server/monsters/monster/spider.qc
@@ -200,7 +200,6 @@ void spider_spawn()
        self.attack_melee               = spider_attack_standing;
        self.attack_ranged              = spider_attack_ranged;
        self.think                              = spider_think;
-       self.sprite_height      = 40;
        
        monsters_setframe(spider_anim_idle);
        

diff --git a/qcsrc/server/monsters/monster/tarbaby.qc b/qcsrc/server/monsters/monster/tarbaby.qc
index 9b077d65ab115bf4f513a811b6b65c7a459ed053..a1edfbd7f5d0f9862502607fd1733b44d748f7ee 100644 (file)
--- a/qcsrc/server/monsters/monster/tarbaby.qc
+++ b/qcsrc/server/monsters/monster/tarbaby.qc
@@ -125,7 +125,6 @@ void tarbaby_spawn ()
        self.attack_melee               = tarbaby_jump;
        self.nextthink                  = time + random() * 0.5 + 0.1;
        self.think                              = tarbaby_think;
-       self.sprite_height              = 20;
        
        monsters_setframe(tarbaby_anim_walk);
        

diff --git a/qcsrc/server/monsters/monster/wizard.qc b/qcsrc/server/monsters/monster/wizard.qc
index c7aa9d4175a47b1070af8684307bc0e89526aba8..f584e8411e797c43e6b8470ebed6449a02ad9ff9 100644 (file)
--- a/qcsrc/server/monsters/monster/wizard.qc
+++ b/qcsrc/server/monsters/monster/wizard.qc
@@ -135,7 +135,6 @@ 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;
        
        monster_setupsounds("wizard");
        

diff --git a/qcsrc/server/monsters/monster/zombie.qc b/qcsrc/server/monsters/monster/zombie.qc
index 3ac204405767861ffb1295fe71c42ed0e77896a0..ffd910184e57e9a8d39ad13853c1332ae4fe37c7 100644 (file)
--- a/qcsrc/server/monsters/monster/zombie.qc
+++ b/qcsrc/server/monsters/monster/zombie.qc
@@ -130,7 +130,6 @@ void zombie_spawn()
        self.classname                  = "monster_zombie";
        self.nextthink                  = time + 2.1;
        self.think                              = zombie_think;
-       self.sprite_height      = 50;
        self.checkattack                = GenericCheckAttack;
        self.attack_melee               = zombie_attack_standing;
        self.attack_ranged              = zombie_attack_ranged;