From 4c25f7a0070b4b89ed99199aa49fe9a249bf8ee9 Mon Sep 17 00:00:00 2001 From: danij Date: Fri, 7 Mar 2008 01:06:10 +0000 Subject: [PATCH] Doom64: Stripped out the half-implemented "Radar" power that was destined for the Outcast addition. --- doomsday/plugins/doom64tc/defs/objects.ded | 112 ------------------- doomsday/plugins/doom64tc/defs/sprites.ded | 2 - doomsday/plugins/doom64tc/defs/text.ded | 5 - doomsday/plugins/doom64tc/include/d_englsh.h | 1 - doomsday/plugins/doom64tc/include/doomdef.h | 1 - doomsday/plugins/doom64tc/include/info.h | 2 - doomsday/plugins/doom64tc/src/p_inter.c | 8 -- 7 files changed, 131 deletions(-) diff --git a/doomsday/plugins/doom64tc/defs/objects.ded b/doomsday/plugins/doom64tc/defs/objects.ded index d534b4fa4e..2ab28fa642 100644 --- a/doomsday/plugins/doom64tc/defs/objects.ded +++ b/doomsday/plugins/doom64tc/defs/objects.ded @@ -5654,30 +5654,6 @@ Thing { Flags = "mf_special mf_countitem"; } -Thing { - ID = "RADAR"; - DoomEd number = 554; - Spawn state = "RMAP"; - See state = "NULL"; - Pain state = "NULL"; - Melee state = "NULL"; - Missile state = "NULL"; - Death state = "NULL"; - Xdeath state = "NULL"; - Raise state = "NULL"; - See sound = "None"; - Attack sound = "None"; - Pain sound = "None"; - Death sound = "None"; - Active sound = "None"; - Reaction time = 8; - Spawn health = 1000; - Radius = 20; - Height = 16; - Mass = 100; - Flags = "mf_special mf_countitem"; -} - Thing { ID = "DOOMSDAY"; DoomEd number = 555; @@ -5702,30 +5678,6 @@ Thing { Flags = "mf_special mf_countitem"; } -Thing { - ID = "UNSEER"; - DoomEd number = 556; - Spawn state = "SEEA_1"; - See state = "NULL"; - Pain state = "NULL"; - Melee state = "NULL"; - Missile state = "NULL"; - Death state = "NULL"; - Xdeath state = "NULL"; - Raise state = "NULL"; - See sound = "None"; - Attack sound = "None"; - Pain sound = "None"; - Death sound = "None"; - Active sound = "None"; - Reaction time = 8; - Spawn health = 1000; - Radius = 20; - Height = 16; - Mass = 100; - Flags = "mf_special mf_countitem"; -} - Thing { ID = "MISC12"; DoomEd number = 2013; @@ -18005,54 +17957,6 @@ State { Next state = "BON3"; } -State { - ID = "RMAP"; - Sprite = "RMAP"; - Frame = 32768; - Tics = 6; - Next state = "RMAP2"; -} - -State { - ID = "RMAP2"; - Sprite = "RMAP"; - Frame = 32769; - Tics = 6; - Next state = "RMAP3"; -} - -State { - ID = "RMAP3"; - Sprite = "RMAP"; - Frame = 32770; - Tics = 6; - Next state = "RMAP4"; -} - -State { - ID = "RMAP4"; - Sprite = "RMAP"; - Frame = 32771; - Tics = 6; - Next state = "RMAP5"; -} - -State { - ID = "RMAP5"; - Sprite = "RMAP"; - Frame = 32770; - Tics = 6; - Next state = "RMAP6"; -} - -State { - ID = "RMAP6"; - Sprite = "RMAP"; - Frame = 32769; - Tics = 6; - Next state = "RMAP"; -} - State { ID = "DETH_1"; Sprite = "DETH"; @@ -18069,22 +17973,6 @@ State { Next state = "DETH_1"; } -State { - ID = "SEEA_1"; - Sprite = "SEEA"; - Frame = 32768; - Tics = 6; - Next state = "SEEA_2"; -} - -State { - ID = "SEEA_2"; - Sprite = "SEEA"; - Frame = 32769; - Tics = 6; - Next state = "SEEA_1"; -} - State { ID = "ACID_RUN1"; Sprite = "ACID"; diff --git a/doomsday/plugins/doom64tc/defs/sprites.ded b/doomsday/plugins/doom64tc/defs/sprites.ded index 65408cabbd..639fd50e3d 100644 --- a/doomsday/plugins/doom64tc/defs/sprites.ded +++ b/doomsday/plugins/doom64tc/defs/sprites.ded @@ -83,9 +83,7 @@ Sprite { ID = "PINS"; } Sprite { ID = "MEGA"; } Sprite { ID = "SUIT"; } Sprite { ID = "PMAP"; } -Sprite { ID = "RMAP"; } Sprite { ID = "DETH"; } -Sprite { ID = "SEEA"; } Sprite { ID = "PVIS"; } Sprite { ID = "CLIP"; } Sprite { ID = "AMMO"; } diff --git a/doomsday/plugins/doom64tc/defs/text.ded b/doomsday/plugins/doom64tc/defs/text.ded index dfa80de290..b2a45bff6d 100644 --- a/doomsday/plugins/doom64tc/defs/text.ded +++ b/doomsday/plugins/doom64tc/defs/text.ded @@ -245,11 +245,6 @@ Text { Text = "Computer Area Map"; } -Text { - ID = "GOTRADAR"; - Text = "Radar"; -} - Text { ID = "GOTVISOR"; Text = "Light Amplification Visor"; diff --git a/doomsday/plugins/doom64tc/include/d_englsh.h b/doomsday/plugins/doom64tc/include/d_englsh.h index b0176bd4e6..9a81c3dc33 100644 --- a/doomsday/plugins/doom64tc/include/d_englsh.h +++ b/doomsday/plugins/doom64tc/include/d_englsh.h @@ -88,7 +88,6 @@ #define GOTINVIS GET_TXT(TXT_GOTINVIS) #define GOTSUIT GET_TXT(TXT_GOTSUIT) #define GOTMAP GET_TXT(TXT_GOTMAP) -#define GOTRADAR GET_TXT(TXT_GOTRADAR) // d64tc #define GOTVISOR GET_TXT(TXT_GOTVISOR) #define GOTMSPHERE GET_TXT(TXT_GOTMSPHERE) #define GOTCLIP GET_TXT(TXT_GOTCLIP) diff --git a/doomsday/plugins/doom64tc/include/doomdef.h b/doomsday/plugins/doom64tc/include/doomdef.h index 0d79b7b006..17f220da9c 100644 --- a/doomsday/plugins/doom64tc/include/doomdef.h +++ b/doomsday/plugins/doom64tc/include/doomdef.h @@ -247,7 +247,6 @@ typedef enum { PT_ALLMAP, PT_INFRARED, PT_FLIGHT, - PT_RADAR, // d64tc NUM_POWER_TYPES } powertype_t; diff --git a/doomsday/plugins/doom64tc/include/info.h b/doomsday/plugins/doom64tc/include/info.h index b8055a94ad..700200a43b 100644 --- a/doomsday/plugins/doom64tc/include/info.h +++ b/doomsday/plugins/doom64tc/include/info.h @@ -114,9 +114,7 @@ typedef enum { SPR_MEGA, SPR_SUIT, SPR_PMAP, - SPR_RMAP, SPR_DETH, - SPR_SEEA, SPR_PVIS, SPR_CLIP, SPR_AMMO, diff --git a/doomsday/plugins/doom64tc/src/p_inter.c b/doomsday/plugins/doom64tc/src/p_inter.c index 4b2428e8d2..2d8f473f39 100644 --- a/doomsday/plugins/doom64tc/src/p_inter.c +++ b/doomsday/plugins/doom64tc/src/p_inter.c @@ -608,14 +608,6 @@ void P_TouchSpecialMobj(mobj_t *special, mobj_t *toucher) sound = sfx_getpow; break; - case SPR_RMAP: // d64tc - if(!P_GivePower(player, PT_RADAR)) - return; - - P_SetMessage(player, GOTRADAR, false); - sound = sfx_getpow; - break; - case SPR_DETH: // d64tc P_Massacre(); P_SetMessage(player, ALLALONE, false);