From b7b4ae7186ad1b53ad31c64dd8731bdb2f290c5f Mon Sep 17 00:00:00 2001 From: danij Date: Sat, 14 Jun 2008 17:54:02 +0000 Subject: [PATCH] jDoom64: Removed the unused P_BounceMissile and the MF_FLOATER mobj flag. --- doomsday/plugins/jdoom64/include/p_mobj.h | 9 --------- doomsday/plugins/jdoom64/src/p_mobj.c | 11 ----------- 2 files changed, 20 deletions(-) diff --git a/doomsday/plugins/jdoom64/include/p_mobj.h b/doomsday/plugins/jdoom64/include/p_mobj.h index 58aaaae39a..de3e08eb29 100644 --- a/doomsday/plugins/jdoom64/include/p_mobj.h +++ b/doomsday/plugins/jdoom64/include/p_mobj.h @@ -223,19 +223,10 @@ typedef struct spawnspot_s { #define MF_CORPSE 0x00100000 // (i) Don't stop moving halfway off a step. #define MF_INFLOAT 0x00200000 // Floating to a height for a move, // don't auto float to target's height. - #define MF_COUNTKILL 0x00400000 // count towards intermission kill total #define MF_COUNTITEM 0x00800000 // count towards intermission item total - #define MF_SKULLFLY 0x01000000 // (i) skull in flight. - #define MF_NOTDMATCH 0x02000000 // (p) not spawned in deathmatch mode (e.g. key cards). - -// FIXME: DJS - d64tc used this without knowing it was already in use by the -// the color translation stuff. We'll resolve this by first seeing what it actually -// does and if usefull we can move it to a free value and implement in the other games. -#define MF_FLOATER 0x04000000 - #define MF_TRANSLATION 0x0c000000 // (i) if 0x4 0x8 or 0xc, use a translation #define MF_TRANSSHIFT 26 // (N/A) table for player colormaps diff --git a/doomsday/plugins/jdoom64/src/p_mobj.c b/doomsday/plugins/jdoom64/src/p_mobj.c index 11d17e5ff4..59b6ad8642 100644 --- a/doomsday/plugins/jdoom64/src/p_mobj.c +++ b/doomsday/plugins/jdoom64/src/p_mobj.c @@ -151,16 +151,6 @@ void P_ExplodeMissile(mobj_t *mo) S_StartSound(mo->info->deathSound, mo); } -/** - * d64tc - * DJS: FIXME - */ -void P_BounceMissile(mobj_t *mo) //kaiser -{ - mo->mom[MZ] *= -(mo->reactionTime * (1.0f / 192)); - S_StartSound(SFX_SSDTH, mo); -} - void P_FloorBounceMissile(mobj_t *mo) { mo->mom[MZ] = -mo->mom[MZ]; @@ -1324,7 +1314,6 @@ void P_SpawnMapThing(spawnspot_t *th) if(th->flags & MTF_FLOAT) { - mobj->flags |= MF_FLOATER; mobj->pos[VZ] += 96; mobj->flags |= (MF_FLOAT | MF_NOGRAVITY); }