Fixed (all games): Bug #2131013 - Segfault if thing pain chance > 0 b…

…ut no pain state. If the specified pain state cannot be found (or none specified) respond by attacking back but not attempting a mobj state change.
skyjake · Feb 16, 2009 · aba3360 · aba3360
1 parent ba4b16a
commit aba3360
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/doomsday/plugins/jdoom/src/p_inter.c b/doomsday/plugins/jdoom/src/p_inter.c
@@ -1119,7 +1119,8 @@ int P_DamageMobj(mobj_t* target, mobj_t* inflictor, mobj_t* source,
         {
             target->flags |= MF_JUSTHIT; // Fight back!
 
-            P_MobjChangeState(target, target->info->painState);
+            if(target->info->painState)
+                P_MobjChangeState(target, target->info->painState);
         }
 
         target->reactionTime = 0; // We're awake now...

diff --git a/doomsday/plugins/jdoom64/src/p_inter.c b/doomsday/plugins/jdoom64/src/p_inter.c
@@ -1208,7 +1208,8 @@ int P_DamageMobj(mobj_t* target, mobj_t* inflictor, mobj_t* source,
         {
             target->flags |= MF_JUSTHIT; // Fight back!
 
-            P_MobjChangeState(target, target->info->painState);
+            if(target->info->painState)
+                P_MobjChangeState(target, target->info->painState);
         }
 
         target->reactionTime = 0; // We're awake now...

diff --git a/doomsday/plugins/jheretic/src/p_inter.c b/doomsday/plugins/jheretic/src/p_inter.c
@@ -1469,7 +1469,8 @@ int P_DamageMobj(mobj_t* target, mobj_t* inflictor, mobj_t* source,
         {
             target->flags |= MF_JUSTHIT; // Fight back!
 
-            P_MobjChangeState(target, target->info->painState);
+            if(target->info->painState)
+                P_MobjChangeState(target, target->info->painState);
         }
 
         target->reactionTime = 0; // We're awake now...

diff --git a/doomsday/plugins/jhexen/src/p_enemy.c b/doomsday/plugins/jhexen/src/p_enemy.c
@@ -3376,7 +3376,7 @@ void C_DECL A_SorcBallOrbit(mobj_t *actor)
     float       dist = parent->radius - actor->radius * 2;
     angle_t     prevangle = (angle_t) actor->special1;
 
-    if(actor->target->health <= 0)
+    if(actor->target->health <= 0 && actor->info->painState)
         P_MobjChangeState(actor, actor->info->painState);
 
     baseangle = (angle_t) parent->special1;

diff --git a/doomsday/plugins/jhexen/src/p_inter.c b/doomsday/plugins/jhexen/src/p_inter.c
@@ -2201,7 +2201,8 @@ int P_DamageMobj(mobj_t* target, mobj_t* inflictor, mobj_t* source,
                 if(P_Random() < 96)
                 {
                     target->flags |= MF_JUSTHIT; // fight back!
-                    P_MobjChangeState(target, target->info->painState);
+                    if(target->info->painState)
+                        P_MobjChangeState(target, target->info->painState);
                 }
                 else
                 {   // "electrocute" the target.
@@ -2224,7 +2225,8 @@ int P_DamageMobj(mobj_t* target, mobj_t* inflictor, mobj_t* source,
             {
                 target->flags |= MF_JUSTHIT; // fight back!
 
-                P_MobjChangeState(target, target->info->painState);
+                if(target->info->painState)
+                    P_MobjChangeState(target, target->info->painState);
                 if(inflictor && inflictor->type == MT_POISONCLOUD)
                 {
                     if(target->flags & MF_COUNTKILL && P_Random() < 128 &&
@@ -2381,7 +2383,8 @@ int P_PoisonDamage(player_t* player, mobj_t* source, int damage,
     {   // Still alive, phew!
         if(!(mapTime & 63) && playPainSound)
         {
-            P_MobjChangeState(target, target->info->painState);
+            if(target->info->painState)
+                P_MobjChangeState(target, target->info->painState);
         }
     }
     else