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 44c5990ac7ef04d2cbdda3d6634e7c6c4943a11c..af03c7cba02415f8eaac20d35a7b0af0b1b5efba 100644 (file)
--- 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 fb089afd52139e12fac2943674b8c2af8089dc76..6e5c3fdf54480faf1f4583cf233e0efd52e2d0f8 100644 (file)
--- 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 0e6fe9e758f727b6e975eadffc9c40841ffeea81..ba6e0535f212caf5a890a9d10683fd406c2b6d73 100644 (file)
--- 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 97494358fbfb8567b3f7667e3b0c6f985c57a50a..a2bfa653ba7fe0cd8ab730fc2d80b577d29c3ce2 100644 (file)
--- 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 48026e621fff2decd856ceced06d2e08f4dd4499..0419674c37e8555e7a85d09967eaf88ae2c5d1c2 100644 (file)
--- 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 ccab7da25091158bf6eb29912d5dc2bbf9e82ebd..9e890efc8b334e26caafc01babd6869f27276060 100644 (file)
--- 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 3a38cbda57ce9255c63286c287272ca6dd371f6e..13d5282b016e15df59e6a2cad378305e15215748 100644 (file)
--- 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 102b40be664ef8f7edd50b1c656ee29727eff96c..545fa2f9cda064f84062ffd7c968ff5c68d37720 100644 (file)
--- 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 e5ad3cc2d9d4ce19306a49bbf3a13777857eebae..8e7870ca15c4bfc7d666c6f928171c73fdc3cf57 100644 (file)
--- 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 af3864a119c86ea72518cb8462ca473a0a059980..d93fadf9ca77208bec44a0bcd2ff828eea006ca5 100644 (file)
--- 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 bdbcf3a36a8b54a0d229ba60127861a8dd4312da..ed4bccd8b1d0784ab0397fac45c25b8b0d0d2c44 100644 (file)
--- 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();