From: Mario <mario.mario@y7mail.com>
Date: Mon, 22 Apr 2013 21:09:36 +0000 (+1000)
Subject: Clean up mage shield code a little
X-Git-Tag: xonotic-v0.8.0~241^2^2~296
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a9d1538e264cd40cdeddc6c5f37a535da72eb64e;p=xonotic%2Fxonotic-data.pk3dir.git

Clean up mage shield code a little
---

diff --git a/qcsrc/server/monsters/monster/shalrath.qc b/qcsrc/server/monsters/monster/shalrath.qc
index ae2804b31..003b69781 100644
--- a/qcsrc/server/monsters/monster/shalrath.qc
+++ b/qcsrc/server/monsters/monster/shalrath.qc
@@ -355,20 +355,25 @@ void shalrath_shield()
 {
 	if(self.weaponentity)
 		return; // already have a shield
-
-	self.weaponentity = spawn();
-	self.weaponentity.owner = self.weaponentity.realowner = self;
-	setmodel(self.weaponentity, "models/onslaught/generator_shield.md3");
-	setattachment(self.weaponentity, self, "");
-	self.weaponentity.classname = "shield";
-	self.weaponentity.ltime = time + autocvar_g_monster_shalrath_shield_time;
-	self.weaponentity.health = 70;
-	self.weaponentity.alpha = 0.5;
-	self.weaponentity.scale = self.scale * 0.6;
-	self.weaponentity.effects = EF_ADDITIVE;
-	self.weaponentity.solid = SOLID_NOT;
-	self.weaponentity.movetype = MOVETYPE_NOCLIP;
-	self.weaponentity.avelocity = '7 0 11';
+		
+	entity shield = spawn();
+
+	shield.owner = self;
+	shield.team = self.team;
+	shield.ltime = time + autocvar_g_monster_shalrath_shield_time;
+	shield.health = 70;
+	shield.classname = "shield";
+	shield.effects = EF_ADDITIVE;
+	shield.movetype = MOVETYPE_NOCLIP;
+	shield.solid = SOLID_TRIGGER;
+	shield.avelocity = '7 0 11';
+	shield.scale = self.scale * 0.6;
+	
+	setattachment(shield, self, "");
+	setmodel(shield, "models/ctf/shield.md3");
+	setsize(shield, shield.scale * shield.mins, shield.scale * shield.maxs);
+	
+	self.weaponentity = shield;
 	
 	self.lastshielded = time + autocvar_g_monster_shalrath_shield_delay;