From: Mario <mario.mario@y7mail.com>
Date: Mon, 2 Sep 2013 02:19:35 +0000 (+1000)
Subject: Remove scale modifiers again (still broken)
X-Git-Tag: xonotic-v0.8.0~241^2^2~90
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b07d0c492501abe703ad570085f2ca52b676bee1;p=xonotic%2Fxonotic-data.pk3dir.git

Remove scale modifiers again (still broken)
---

diff --git a/qcsrc/common/monsters/cl_monsters.qc b/qcsrc/common/monsters/cl_monsters.qc
index 5a740aa42..0e99d4548 100644
--- a/qcsrc/common/monsters/cl_monsters.qc
+++ b/qcsrc/common/monsters/cl_monsters.qc
@@ -4,7 +4,6 @@
 
 
 .vector glowmod;
-.float miniboss;
 void monster_changeteam()
 {
 	self.glowmod = Team_ColorRGB(self.team - 1);
@@ -191,35 +190,15 @@ void monster_draw()
 void monster_construct()
 {
 	entity mon = get_monsterinfo(self.monsterid);
-	vector min_s, max_s;
 
-	if(self.miniboss)
-	{
-		if(mon.spawnflags & MONSTER_SIZE_BROKEN)
-			self.scale = 1.95;
-		else
-			self.scale = 1.5;
-			
-		min_s = mon.mins * 1.5;
-		max_s = mon.maxs * 1.5;
-		
-	}
-	else
-	{
-		if(mon.spawnflags & MONSTER_SIZE_BROKEN)
-			self.scale = 1.3;
-		else
-			self.scale = 1;
-			
-		min_s = mon.mins;
-		max_s = mon.maxs;
-	}
+	if(mon.spawnflags & MONSTER_SIZE_BROKEN)
+		self.scale = 1.3;
 
 	self.netname = M_NAME(self.monsterid);
 
 	setorigin(self, self.origin);
 	setmodel(self, mon.model);
-	setsize(self, min_s, max_s);
+	setsize(self, mon.mins, mon.maxs);
 
 	self.move_movetype	= MOVETYPE_BOUNCE;
 	self.health			= 255;
@@ -254,8 +233,6 @@ void ent_monster()
 
 		self.skin = ReadByte();
 		self.team = ReadByte();
-		
-		self.miniboss = ReadByte();
 
 		monster_construct();
 		monster_changeteam();
diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 181156399..693960180 100644
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -344,16 +344,6 @@ void Monster_CheckMinibossFlag ()
 		self.health += autocvar_g_monsters_miniboss_healthboost;
 		if not(self.weapon)
 			self.weapon = WEP_NEX;
-		
-		entity mon = get_monsterinfo(self.monsterid);
-		
-		if(mon.spawnflags & MONSTER_SIZE_BROKEN)
-			self.scale = 1.95;
-		else
-			self.scale = 1.5;
-			
-		setsize(self, mon.mins * 1.5, mon.maxs * 1.5);
-		setorigin(self, self.origin + '0 0 25'); // offset so we don't fall through the floor
 	}
 }
 
@@ -832,7 +822,6 @@ float monster_send(entity to, float sf)
 
 		WriteByte(MSG_ENTITY, self.skin);
 		WriteByte(MSG_ENTITY, self.team);
-		WriteByte(MSG_ENTITY, (self.spawnflags & MONSTERFLAG_MINIBOSS));
 	}
 
 	if(sf & MSF_ANG)
@@ -1081,7 +1070,7 @@ float monster_initialize(float mon_id, float nodrop)
 	if not(self.spawnflags & MONSTERFLAG_SPAWNED) // naturally spawned monster
 	if not(self.monster_respawned)
 		monsters_total += 1;
-	
+
 	setsize(self, mon.mins, mon.maxs);
 	self.flags				= FL_MONSTER;
 	self.takedamage			= DAMAGE_AIM;
@@ -1104,11 +1093,11 @@ float monster_initialize(float mon_id, float nodrop)
 	self.reset				= monsters_reset;
 	self.netname			= mon.netname;
 	self.monster_name		= M_NAME(mon_id);
-	self.scale				= 1;
 	self.candrop			= TRUE;
 	self.view_ofs			= '0 0 1' * (self.maxs_z * 0.5);
 	self.oldtarget2			= self.target2;
 	self.deadflag			= DEAD_NO;
+	self.scale				= 1;
 	self.noalign			= nodrop;
 	self.spawn_time			= time;
 	self.gravity			= 1;
@@ -1122,7 +1111,7 @@ float monster_initialize(float mon_id, float nodrop)
 		self.flags |= FL_FLY;
 		self.movetype = MOVETYPE_FLY;
 	}
-	
+
 	if(mon.spawnflags & MONSTER_SIZE_BROKEN)
 		self.scale = 1.3;