From: Mario <mario.mario@y7mail.com>
Date: Mon, 15 Apr 2013 04:43:52 +0000 (+1000)
Subject: Remove sprite_height
X-Git-Tag: xonotic-v0.8.0~241^2^2~393
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0cd42529cf6d4f3c19ca4badf5dcce2a73a4e007;p=xonotic%2Fxonotic-data.pk3dir.git

Remove sprite_height
---

diff --git a/qcsrc/server/monsters/lib/defs.qh b/qcsrc/server/monsters/lib/defs.qh
index 79d3903d8..9acf68d74 100644
--- 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 c125157cc..c644252f5 100644
--- 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 e1a0383d1..e60a26b43 100644
--- 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 dcee7649a..fbf82b2df 100644
--- 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 463315db5..f5c15f5e3 100644
--- 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 4397efb21..498d5c102 100644
--- 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 064b25207..17b38658d 100644
--- 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 1feb98daa..d92852757 100644
--- 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 7f4554720..ee4c1f99b 100644
--- 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 44f1f9b99..3fa9b6401 100644
--- 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 7c3727f6b..6c23bbb58 100644
--- 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 e94ecc71e..b21b153d0 100644
--- 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 9b077d65a..a1edfbd7f 100644
--- 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 c7aa9d417..f584e8411 100644
--- 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 3ac204405..ffd910184 100644
--- 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;