From 468d5afbf0fc6c03bcef355f5f8f04089ac805a8 Mon Sep 17 00:00:00 2001
From: Samuel Villareal
Date: Tue, 31 Aug 2010 06:24:10 +0000
Subject: + All doom mobjtypes commented out or replaced as placeholders +
 Strife mobjinfo structure filled + strife mobj flags added

Subversion-branch: /branches/strife-branch
Subversion-revision: 1985
---
 src/strife/p_mobj.c | 22 +++++++++++++---------
 1 file changed, 13 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 88bf5e28..891e453f 100644
--- a/src/strife/p_mobj.c
+++ b/src/strife/p_mobj.c
@@ -582,8 +582,8 @@ void P_RemoveMobj (mobj_t* mobj)
 {
     if ((mobj->flags & MF_SPECIAL)
 	&& !(mobj->flags & MF_DROPPED)
-	&& (mobj->type != MT_INV)
-	&& (mobj->type != MT_INS))
+	/*&& (mobj->type != MT_INV) // villsa [STRIFE] unused
+	&& (mobj->type != MT_INS)*/)
     {
 	itemrespawnque[iquehead] = mobj->spawnpoint;
 	itemrespawntime[iquehead] = leveltime;
@@ -819,8 +819,8 @@ void P_SpawnMapThing (mapthing_t* mthing)
 		
     // don't spawn any monsters if -nomonsters
     if (nomonsters
-	&& ( i == MT_SKULL
-	     || (mobjinfo[i].flags & MF_COUNTKILL)) )
+	&& ( /*i == MT_SKULL    // villsa [STRIFE] unused
+	     ||*/ (mobjinfo[i].flags & MF_COUNTKILL)) )
     {
 	return;
     }
@@ -841,8 +841,10 @@ void P_SpawnMapThing (mapthing_t* mthing)
 	mobj->tics = 1 + (P_Random () % mobj->tics);
     if (mobj->flags & MF_COUNTKILL)
 	totalkills++;
-    if (mobj->flags & MF_COUNTITEM)
-	totalitems++;
+
+    // villsa [STRIFE] unused
+    /*if (mobj->flags & MF_COUNTITEM)
+	totalitems++;*/
 		
     mobj->angle = ANG45 * (mthing->angle/45);
     if (mthing->options & MTF_AMBUSH)
@@ -871,7 +873,8 @@ P_SpawnPuff
 	
     z += ((P_Random()-P_Random())<<10);
 
-    th = P_SpawnMobj (x,y,z, MT_PUFF);
+    // villsa [STRIFE] TODO - update
+    th = P_SpawnMobj (x,y,z, MT_STRIFEPUFF);
     th->momz = FRACUNIT;
     th->tics -= P_Random()&3;
 
@@ -896,7 +899,8 @@ P_SpawnBlood
   fixed_t	z,
   int		damage )
 {
-    mobj_t*	th;
+    // villsa [STRIFE] TODO - update to strife version
+/*    mobj_t*	th;
 	
     z += ((P_Random()-P_Random())<<10);
     th = P_SpawnMobj (x,y,z, MT_BLOOD);
@@ -904,7 +908,7 @@ P_SpawnBlood
     th->tics -= P_Random()&3;
 
     if (th->tics < 1)
-	th->tics = 1;
+	th->tics = 1;*/
 		
     // villsa [STRIFE] TODO - proper blood states
     /*if (damage <= 12 && damage >= 9)
-- 
cgit v1.2.3