From 2f326ebddc4f4de18909b557fa69fe74ac849e82 Mon Sep 17 00:00:00 2001
From: James Haley
Date: Sun, 26 Sep 2010 06:26:50 +0000
Subject: Identified quest #7 (killed Blue Acolytes), fixed a bug in
 P_SpawnMobj (Strife doesn't withhold mobj->reactioncount in skill 5), added
 static line specials 142, 143, and 149 for vertical texture scrolling, and
 made note of a bug with Irale's door line type.

Subversion-branch: /branches/strife-branch
Subversion-revision: 2142
---
 src/strife/p_mobj.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'src/strife/p_mobj.c')

diff --git a/src/strife/p_mobj.c b/src/strife/p_mobj.c
index 3a8486a3..36b05cbd 100644
--- a/src/strife/p_mobj.c
+++ b/src/strife/p_mobj.c
@@ -597,11 +597,11 @@ P_SpawnMobj
     mobj_t*	mobj;
     state_t*	st;
     mobjinfo_t*	info;
-	
+
     mobj = Z_Malloc (sizeof(*mobj), PU_LEVEL, NULL);
     memset (mobj, 0, sizeof (*mobj));
     info = &mobjinfo[type];
-	
+
     mobj->type = type;
     mobj->info = info;
     mobj->x = x;
@@ -611,8 +611,10 @@ P_SpawnMobj
     mobj->flags = info->flags;
     mobj->health = info->spawnhealth;
 
-    if (gameskill != sk_nightmare)
-	mobj->reactiontime = info->reactiontime;
+    // haleyjd 09/25/10: [STRIFE] Doesn't do this; messes up flamethrower
+    // and a lot of other stuff.
+    //if (gameskill != sk_nightmare)
+    mobj->reactiontime = info->reactiontime;
     
     mobj->lastlook = P_Random () % MAXPLAYERS;
     // do not set the state with P_SetMobjState,
@@ -626,13 +628,13 @@ P_SpawnMobj
 
     // set subsector and/or block links
     P_SetThingPosition (mobj);
-	
+
     mobj->floorz = mobj->subsector->sector->floorheight;
     mobj->ceilingz = mobj->subsector->sector->ceilingheight;
 
     if (z == ONFLOORZ)
     {
-	mobj->z = mobj->floorz;
+        mobj->z = mobj->floorz;
 
         // villsa [STRIFE]
         if(P_GetTerrainType(mobj) != FLOOR_SOLID)
@@ -640,12 +642,12 @@ P_SpawnMobj
 
     }
     else if (z == ONCEILINGZ)
-	mobj->z = mobj->ceilingz - mobj->info->height;
+        mobj->z = mobj->ceilingz - mobj->info->height;
     else 
-	mobj->z = z;
+        mobj->z = z;
 
     mobj->thinker.function.acp1 = (actionf_p1)P_MobjThinker;
-	
+
     P_AddThinker (&mobj->thinker);
 
     return mobj;
-- 
cgit v1.2.3