From: Mario <mario.mario@y7mail.com>
Date: Mon, 4 Mar 2013 08:03:40 +0000 (+1100)
Subject: Remove pain_finished from each monster's spawncode into the post-spawn hook
X-Git-Tag: xonotic-v0.8.0~241^2^2~486
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=17fd7f3c3dbed49447f0a89a960ab597399686fa;p=xonotic%2Fxonotic-data.pk3dir.git

Remove pain_finished from each monster's spawncode into the post-spawn hook
---

diff --git a/qcsrc/server/monsters/monster/demon.qc b/qcsrc/server/monsters/monster/demon.qc
index 44c5990ac..af03c7cba 100644
--- a/qcsrc/server/monsters/monster/demon.qc
+++ b/qcsrc/server/monsters/monster/demon.qc
@@ -78,7 +78,6 @@ void demon_die ()
 	self.movetype 		= MOVETYPE_TOSS;
 	self.enemy		  	= world;
 	self.nextthink	  	= time + 3;
-	self.pain_finished  = self.nextthink;
 	
 	monster_hook_death(); // for post-death mods
 }
diff --git a/qcsrc/server/monsters/monster/enforcer.qc b/qcsrc/server/monsters/monster/enforcer.qc
index fb089afd5..6e5c3fdf5 100644
--- a/qcsrc/server/monsters/monster/enforcer.qc
+++ b/qcsrc/server/monsters/monster/enforcer.qc
@@ -116,7 +116,6 @@ void enforcer_die ()
 	self.event_damage   = func_null;
 	self.enemy		  	= world;
 	self.nextthink	  	= time + 2.1;
-	self.pain_finished  = self.nextthink;
 	
 	remove(self.weaponentity);
 	self.weaponentity = world;
diff --git a/qcsrc/server/monsters/monster/fish.qc b/qcsrc/server/monsters/monster/fish.qc
index 0e6fe9e75..ba6e0535f 100644
--- a/qcsrc/server/monsters/monster/fish.qc
+++ b/qcsrc/server/monsters/monster/fish.qc
@@ -41,7 +41,6 @@ void fish_die ()
 	self.takedamage	 	= DAMAGE_NO;
 	self.event_damage   = func_null;
 	self.enemy		  	= world;
-	self.pain_finished  = self.nextthink;
 	self.frame 			= fish_anim_death;
 	self.think 			= Monster_Fade;
 	self.nextthink 		= time + 2.1;
diff --git a/qcsrc/server/monsters/monster/hknight.qc b/qcsrc/server/monsters/monster/hknight.qc
index 97494358f..a2bfa653b 100644
--- a/qcsrc/server/monsters/monster/hknight.qc
+++ b/qcsrc/server/monsters/monster/hknight.qc
@@ -403,7 +403,6 @@ void hellknight_die ()
 	self.movetype		= MOVETYPE_TOSS;
 	self.think			= Monster_Fade;
 	self.nextthink	  	= time + 2.1;
-	self.pain_finished  = self.nextthink;
 	
 	if(chance < 0.10 || self.flags & MONSTERFLAG_MINIBOSS)
 	{
diff --git a/qcsrc/server/monsters/monster/knight.qc b/qcsrc/server/monsters/monster/knight.qc
index 48026e621..0419674c3 100644
--- a/qcsrc/server/monsters/monster/knight.qc
+++ b/qcsrc/server/monsters/monster/knight.qc
@@ -53,7 +53,6 @@ void knight_die ()
 	self.think			= Monster_Fade;
 	self.movetype 		= MOVETYPE_TOSS;
 	self.nextthink	  	= time + 2.1;
-	self.pain_finished  = self.nextthink;
 	
 	monster_hook_death(); // for post-death mods
 }
diff --git a/qcsrc/server/monsters/monster/ogre.qc b/qcsrc/server/monsters/monster/ogre.qc
index ccab7da25..9e890efc8 100644
--- a/qcsrc/server/monsters/monster/ogre.qc
+++ b/qcsrc/server/monsters/monster/ogre.qc
@@ -130,7 +130,6 @@ void ogre_die()
 	self.event_damage   = func_null;
 	self.enemy		  	= world;
 	self.nextthink	  	= time + 2.1;
-	self.pain_finished  = self.nextthink;
 	self.movetype		= MOVETYPE_TOSS;
 	self.think 			= Monster_Fade;
 	
diff --git a/qcsrc/server/monsters/monster/shalrath.qc b/qcsrc/server/monsters/monster/shalrath.qc
index 3a38cbda5..13d5282b0 100644
--- a/qcsrc/server/monsters/monster/shalrath.qc
+++ b/qcsrc/server/monsters/monster/shalrath.qc
@@ -202,8 +202,7 @@ void shalrath_die ()
 	self.takedamage	 	= DAMAGE_NO;
 	self.event_damage   = func_null;
 	self.enemy		  	= world;
-	self.nextthink	  	= time + 2.1;
-	self.pain_finished  = self.nextthink;	
+	self.nextthink	  	= time + 2.1;	
 	self.movetype		= MOVETYPE_TOSS;
 	
 	monster_hook_death(); // for post-death mods
diff --git a/qcsrc/server/monsters/monster/shambler.qc b/qcsrc/server/monsters/monster/shambler.qc
index 102b40be6..545fa2f9c 100644
--- a/qcsrc/server/monsters/monster/shambler.qc
+++ b/qcsrc/server/monsters/monster/shambler.qc
@@ -147,7 +147,6 @@ void shambler_die ()
 	self.enemy		  	= world;
 	self.nextthink	  	= time + 2.1;
 	self.frame			= shambler_anim_death;
-	self.pain_finished  = self.nextthink;
 	self.movetype 		= MOVETYPE_TOSS;
 	
 	monster_hook_death(); // for post-death mods
diff --git a/qcsrc/server/monsters/monster/soldier.qc b/qcsrc/server/monsters/monster/soldier.qc
index e5ad3cc2d..8e7870ca1 100644
--- a/qcsrc/server/monsters/monster/soldier.qc
+++ b/qcsrc/server/monsters/monster/soldier.qc
@@ -254,7 +254,6 @@ void soldier_die()
 	self.movetype		= MOVETYPE_TOSS;
 	self.think			= Monster_Fade;
 	self.nextthink	  	= time + 2.1;
-	self.pain_finished  = self.nextthink;
 	self.weaponentity	= world;
 	
 	if (self.attack_ranged == soldier_missile_uzi)
diff --git a/qcsrc/server/monsters/monster/spider.qc b/qcsrc/server/monsters/monster/spider.qc
index af3864a11..d93fadf9c 100644
--- a/qcsrc/server/monsters/monster/spider.qc
+++ b/qcsrc/server/monsters/monster/spider.qc
@@ -38,7 +38,6 @@ void spider_die ()
 	self.movetype		= MOVETYPE_TOSS;
 	self.think			= Monster_Fade;
 	self.nextthink	  	= time + 2.1;
-	self.pain_finished  = self.nextthink;
 	self.frame			= spider_anim_attack;
 	
 	monster_hook_death(); // for post-death mods
@@ -187,7 +186,6 @@ void spider_spawn()
 	
 	self.classname			= "monster_spider";
 	self.nextthink	  		= time + random() * 0.5 + 0.1;
-	self.pain_finished  	= self.nextthink;
 	self.frame		  		= spider_anim_idle;
 	self.checkattack		= GenericCheckAttack;
 	self.attack_melee		= spider_attack_standing;
diff --git a/qcsrc/server/monsters/monster/wizard.qc b/qcsrc/server/monsters/monster/wizard.qc
index bdbcf3a36..ed4bccd8b 100644
--- a/qcsrc/server/monsters/monster/wizard.qc
+++ b/qcsrc/server/monsters/monster/wizard.qc
@@ -113,7 +113,6 @@ void wizard_die ()
 	self.movetype		= MOVETYPE_TOSS;
 	self.flags		  	= FL_ONGROUND;
 	self.nextthink	  	= time + 2.1;
-	self.pain_finished  = self.nextthink; 
 	self.velocity_x 	= -200 + 400*random();
 	self.velocity_y 	= -200 + 400*random();
 	self.velocity_z 	= 100 + 100*random();