summaryrefslogtreecommitdiff
path: root/src/strife/p_map.c
diff options
context:
space:
mode:
authorJames Haley2011-02-23 09:25:47 +0000
committerJames Haley2011-02-23 09:25:47 +0000
commit7604a0956a73158e0f19a9437307556bc9b4ba56 (patch)
tree151155d00470e8492c5fc558a7899bb4c0cf4b04 /src/strife/p_map.c
parent71f19d8d1ff5b914ac3871d6f740aaff00db82aa (diff)
downloadchocolate-doom-7604a0956a73158e0f19a9437307556bc9b4ba56.tar.gz
chocolate-doom-7604a0956a73158e0f19a9437307556bc9b4ba56.tar.bz2
chocolate-doom-7604a0956a73158e0f19a9437307556bc9b4ba56.zip
Removed all dead code containing P_Random calls to avoid false hits in
list, removed all remaining order-of-evaluation portability problems, and heavily altered behavior of T_FireFlicker thinkers to match the binary (had no clue they changed this previously!). Subversion-branch: /branches/strife-branch Subversion-revision: 2274
Diffstat (limited to 'src/strife/p_map.c')
-rw-r--r--src/strife/p_map.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/strife/p_map.c b/src/strife/p_map.c
index c557f968..206d8664 100644
--- a/src/strife/p_map.c
+++ b/src/strife/p_map.c
@@ -341,20 +341,7 @@ boolean PIT_CheckThing (mobj_t* thing)
return true; // underneath
// villsa [STRIFE] unused
- // check for skulls slamming into things
- /*if (tmthing->flags & MF_SKULLFLY)
- {
- damage = ((P_Random()%8)+1)*tmthing->info->damage;
-
- P_DamageMobj (thing, tmthing, tmthing, damage);
-
- tmthing->flags &= ~MF_SKULLFLY;
- tmthing->momx = tmthing->momy = tmthing->momz = 0;
-
- P_SetMobjState (tmthing, tmthing->info->spawnstate);
-
- return false; // stop moving
- }*/
+ // check for skulls slamming into things (removed)
// missiles can hit other things
if (tmthing->flags & MF_MISSILE)