diff --git a/Source/d_main.c b/Source/d_main.c index 97bb2838..09cf588e 100644 --- a/Source/d_main.c +++ b/Source/d_main.c @@ -370,14 +370,12 @@ void D_PageDrawer(void) while (s--) c = c*3 + t[s]; V_DrawPatch(0, 0, 0, (patch_t *) t); -#ifdef DOGS if (c==2119826587u || c==2391756584u) // [FG] removed the embedded DOGOVRLY title pic overlay graphic lump if (W_CheckNumForName("DOGOVRLY") > 0) { V_DrawPatch(0, 0, 0, W_CacheLumpName("DOGOVRLY", PU_CACHE)); } -#endif } else M_DrawCredits(); @@ -1482,7 +1480,6 @@ void D_DoomMain(void) // killough 10/98: process all command-line DEH's first D_ProcessDehCommandLine(); -#ifdef BETA // killough 7/19/98: beta emulation option beta_emulation = !!M_CheckParm("-beta"); @@ -1497,7 +1494,6 @@ void D_DoomMain(void) } else mobjinfo[MT_SCEPTRE].doomednum = mobjinfo[MT_BIBLE].doomednum = -1; -#endif // jff 1/24/98 set both working and command line value of play parms nomonsters = clnomonsters = M_CheckParm ("-nomonsters"); @@ -1616,14 +1612,12 @@ void D_DoomMain(void) sidemove[1] = sidemove[1]*scale/100; } -#ifdef BETA if (beta_emulation) { char s[PATH_MAX+1]; sprintf(s, "betagrph.wad"); D_AddFile(s); } -#endif // add any files specified on the command line with -file wadfile // to the wad list diff --git a/Source/doomstat.c b/Source/doomstat.c index 287266a4..bbc18d2c 100644 --- a/Source/doomstat.c +++ b/Source/doomstat.c @@ -76,18 +76,14 @@ int default_monster_infighting=1; int monster_friction=1; // killough 10/98: monsters affected by friction int default_monster_friction=1; -#ifdef BETA // killough 7/19/98: classic Doom BFG int classic_bfg, default_classic_bfg; // killough 7/24/98: Emulation of Press Release version of Doom int beta_emulation; -#endif -#ifdef DOGS int dogs, default_dogs; // killough 7/19/98: Marine's best friend :) int dog_jumping, default_dog_jumping; // killough 10/98 -#endif // killough 8/8/98: distance friends tend to move towards players int distfriend = 128, default_distfriend = 128; diff --git a/Source/doomstat.h b/Source/doomstat.h index b096ccda..815d7afe 100644 --- a/Source/doomstat.h +++ b/Source/doomstat.h @@ -311,18 +311,14 @@ extern int default_weapon_recoil; extern int player_bobbing; // whether player bobs or not // phares 2/25/98 extern int default_player_bobbing; // killough 3/1/98: make local to each game -#ifdef BETA // killough 7/19/98: Classic Pre-Beta BFG extern int classic_bfg, default_classic_bfg; // killough 7/24/98: Emulation of Press Release version of Doom extern int beta_emulation; -#endif -#ifdef DOGS extern int dogs, default_dogs; // killough 7/19/98: Marine's best friend :) extern int dog_jumping, default_dog_jumping; // killough 10/98 -#endif // killough 8/8/98: distance friendly monsters tend to stay from player extern int distfriend, default_distfriend; diff --git a/Source/g_game.c b/Source/g_game.c index 47b5f5cf..0397ab7b 100644 --- a/Source/g_game.c +++ b/Source/g_game.c @@ -642,12 +642,8 @@ static void G_DoLoadLevel(void) skytexture = R_TextureNumForName ("SKY1"); break; case 2: -#ifdef BETA // killough 10/98: beta version had different sky orderings skytexture = R_TextureNumForName (beta_emulation ? "SKY1" : "SKY2"); -#else - skytexture = R_TextureNumForName ("SKY2"); -#endif break; case 3: skytexture = R_TextureNumForName ("SKY3"); @@ -1163,15 +1159,11 @@ static void G_DoPlayDemo(void) monster_infighting = 1; // killough 7/19/98 -#ifdef BETA classic_bfg = 0; // killough 7/19/98 beta_emulation = 0; // killough 7/24/98 -#endif -#ifdef DOGS dogs = 0; // killough 7/19/98 dog_jumping = 0; // killough 10/98 -#endif monster_backing = 0; // killough 9/8/98 @@ -2009,7 +2001,6 @@ void G_DeferedInitNew(skill_t skill, int episode, int map) gameaction = ga_newgame; } -#ifdef DOGS // killough 7/19/98: Marine's best friend :) static int G_GetHelpers(void) { @@ -2019,7 +2010,6 @@ static int G_GetHelpers(void) j = M_CheckParm ("-dogs"); return j ? j+1 < myargc ? atoi(myargv[j+1]) : 1 : default_dogs; } -#endif // killough 3/1/98: function to reload all the default parameter // settings before a new game begins @@ -2040,10 +2030,8 @@ void G_ReloadDefaults(void) monster_infighting = default_monster_infighting; // killough 7/19/98 -#ifdef DOGS dogs = netgame ? 0 : G_GetHelpers(); // killough 7/19/98 dog_jumping = default_dog_jumping; -#endif distfriend = default_distfriend; // killough 8/8/98 @@ -2057,10 +2045,8 @@ void G_ReloadDefaults(void) monkeys = default_monkeys; -#ifdef BETA classic_bfg = default_classic_bfg; // killough 7/19/98 beta_emulation = !!M_CheckParm("-beta"); // killough 7/24/98 -#endif // jff 1/24/98 reset play mode to command line spec'd version // killough 3/1/98: moved to here @@ -2266,19 +2252,10 @@ byte *G_WriteOptions(byte *demo_p) *demo_p++ = monster_infighting; // killough 7/19/98 -#ifdef DOGS *demo_p++ = dogs; // killough 7/19/98 -#else - *demo_p++ = 0; -#endif -#ifdef BETA *demo_p++ = classic_bfg; // killough 7/19/98 *demo_p++ = beta_emulation; // killough 7/24/98 -#else - *demo_p++ = 0; - *demo_p++ = 0; -#endif *demo_p++ = (distfriend >> 8) & 0xff; // killough 8/8/98 *demo_p++ = distfriend & 0xff; // killough 8/8/98 @@ -2291,11 +2268,7 @@ byte *G_WriteOptions(byte *demo_p) *demo_p++ = help_friends; // killough 9/9/98 -#ifdef DOGS *demo_p++ = dog_jumping; -#else - *demo_p++ = 0; -#endif *demo_p++ = monkeys; @@ -2361,22 +2334,14 @@ byte *G_ReadOptions(byte *demo_p) { monster_infighting = *demo_p++; // killough 7/19/98 -#ifdef DOGS dogs = *demo_p++; // killough 7/19/98 -#else - demo_p++; -#endif -#ifdef BETA classic_bfg = *demo_p++; // killough 7/19/98 beta_emulation = *demo_p++; // killough 7/24/98 if (beta_emulation && !M_CheckParm("-beta")) I_Error("The -beta option is required to play " "back beta emulation demos"); -#else - demo_p += 2; -#endif distfriend = *demo_p++ << 8; // killough 8/8/98 distfriend+= *demo_p++; @@ -2389,11 +2354,7 @@ byte *G_ReadOptions(byte *demo_p) help_friends = *demo_p++; // killough 9/9/98 -#ifdef DOGS dog_jumping = *demo_p++; // killough 10/98 -#else - demo_p++; -#endif monkeys = *demo_p++; @@ -2423,15 +2384,11 @@ byte *G_ReadOptions(byte *demo_p) help_friends = 0; // killough 9/9/98 -#ifdef BETA classic_bfg = 0; // killough 7/19/98 beta_emulation = 0; // killough 7/24/98 -#endif -#ifdef DOGS dogs = 0; // killough 7/19/98 dog_jumping = 0; // killough 10/98 -#endif monkeys = 0; } diff --git a/Source/info.c b/Source/info.c index 24cfc54a..b1c6243d 100644 --- a/Source/info.c +++ b/Source/info.c @@ -72,16 +72,12 @@ char *sprnames[NUMSPRITES+1] = { "HDB4","HDB5","HDB6","POB1","POB2","BRS1","TLMP","TLP2", "TNT1", // invisible sprite phares 3/9/98 -#ifdef DOGS "DOGS", // killough 7/19/98: Marine's best friend :) -#endif -#ifdef BETA "PLS1", // killough 7/19/98: first of two plasma fireballs in the beta "PLS2", // killough 7/19/98: second of two plasma fireballs in the beta "BON3", // killough 7/11/98: evil sceptre in the beta version "BON4", // killough 7/11/98: unholy bible in the beta version -#endif NULL }; @@ -1182,7 +1178,6 @@ state_t states[NUMSTATES] = { {SPR_MISL,32770,6,A_Detonate,S_DETONATE3}, // S_DETONATE2 {SPR_MISL,32771,10,NULL,S_NULL}, // S_DETONATE3 -#ifdef DOGS // killough 7/19/98: Marine's best friend :) {SPR_DOGS,0,10,A_Look,S_DOGS_STND2}, // S_DOGS_STND {SPR_DOGS,1,10,A_Look,S_DOGS_STND}, // S_DOGS_STND2 @@ -1211,9 +1206,7 @@ state_t states[NUMSTATES] = { {SPR_DOGS,10,5,NULL,S_DOGS_RAISE5}, // S_DOGS_RAISE4 {SPR_DOGS,9,5,NULL,S_DOGS_RAISE6}, // S_DOGS_RAISE5 {SPR_DOGS,8,5,NULL,S_DOGS_RUN1}, // S_DOGS_RAISE6 -#endif -#ifdef BETA // killough 7/11/98: beta BFG begins here // S_OLDBFG1 @@ -1287,8 +1280,6 @@ state_t states[NUMSTATES] = { {SPR_SKUL,15,5,A_Fall,S_BSKUL_DIE8}, // S_BSKUL_DIE7 {SPR_SKUL,16,5,A_Stop,S_BSKUL_DIE8}, // S_BSKUL_DIE8 -#endif - // killough 10/98: mushroom effect {SPR_MISL,32769,8,A_Mushroom,S_EXPLODE2}, // S_MUSHROOM }; @@ -4934,7 +4925,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = { S_NULL // raisestate }, -#ifdef DOGS // Marine's best friend :) // killough 7/19/98 { // MT_DOGS 888, // doomednum @@ -4961,9 +4951,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = { MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL, // flags S_DOGS_RAISE1 // raisestate }, -#endif -#ifdef BETA // killough 7/11/98: this is the first of two plasma fireballs in the beta { // MT_PLASMA1 -1, // doomednum @@ -5071,7 +5059,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = { MF_SPECIAL|MF_COUNTITEM, // flags S_NULL // raisestate }, -#endif /* BETA */ }; @@ -7755,15 +7742,11 @@ static const char cr_yellow[]= 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239, 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255}; -#ifdef DOGS // [FG] replace embedded non-free dogs sprites and sounds #include "dogs.c" -#endif /* DOGS */ -#ifdef BETA // [FG] replace embedded non-free plasma ball sprites #include "beta.c" -#endif /* BETA */ // killough 1/31/98: // Table of predefined lumps, used to make up for any wad deficiencies. @@ -7836,7 +7819,6 @@ const lumpinfo_t predefined_lumps[]={ { "S_START"}, // killough 3/21/98 { "TNT1A0", sizeof invis_sprite, invis_sprite }, // invis sprite -#ifdef DOGS // killough 7/19/98: Marine's best friend :) {"DOGSA1", sizeof dogsa1, dogsa1}, {"DOGSA2", sizeof dogsa2, dogsa2}, @@ -7908,9 +7890,7 @@ const lumpinfo_t predefined_lumps[]={ {"DOGSL0", sizeof dogsl0, dogsl0}, {"DOGSM0", sizeof dogsm0, dogsm0}, {"DOGSN0", sizeof dogsn0, dogsn0}, -#endif -#ifdef BETA // killough 7/19/98: Pre-Beta BFG fireballs {"PLS1A0", sizeof pls1a0, pls1a0}, {"PLS1B0", sizeof pls1b0, pls1b0}, @@ -7924,18 +7904,15 @@ const lumpinfo_t predefined_lumps[]={ {"PLS2C0", sizeof pls2c0, pls2c0}, {"PLS2D0", sizeof pls2d0, pls2d0}, {"PLS2E0", sizeof pls2e0, pls2e0}, -#endif // end of sprites { "S_END"}, // phares 3/9/98 killough 3/21/98 -#ifdef DOGS {"DSDGSIT", sizeof dsdgsit, dsdgsit}, {"DSDGATK", sizeof dsdgatk, dsdgatk}, {"DSDGACT", sizeof dsdgact, dsdgact}, {"DSDGDTH", sizeof dsdgdth, dsdgdth}, {"DSDGPAIN", sizeof dsdgpain, dsdgpain}, -#endif { "SWITCHES", sizeof switches, switches}, // jff 3/23/98 switch list { "ANIMATED", sizeof animated, animated}, // jff 3/23/98 animation list diff --git a/Source/info.h b/Source/info.h index 1fc0b5e6..d4c2ae29 100644 --- a/Source/info.h +++ b/Source/info.h @@ -183,16 +183,12 @@ typedef enum SPR_TLP2, SPR_TNT1, -#ifdef DOGS SPR_DOGS, // killough 7/19/98: Marine's best friend :) -#endif -#ifdef BETA SPR_PLS1, // killough 7/19/98: first of two plasma fireballs in the beta SPR_PLS2, // killough 7/19/98: second of two plasma fireballs in the beta SPR_BON3, // killough 7/11/98: evil sceptre in beta version SPR_BON4, // killough 7/11/98: unholy bible in beta version -#endif NUMSPRITES // counter of how many there are } spritenum_t; @@ -1176,7 +1172,6 @@ typedef enum S_DETONATE2, S_DETONATE3, -#ifdef DOGS S_DOGS_STND, // killough 7/19/98: Marine's best friend :) S_DOGS_STND2, S_DOGS_RUN1, @@ -1204,9 +1199,7 @@ typedef enum S_DOGS_RAISE4, S_DOGS_RAISE5, S_DOGS_RAISE6, -#endif -#ifdef BETA S_OLDBFG1, // killough 7/11/98: the old BFG's 43 firing frames S_OLDBFG42 = S_OLDBFG1+41, S_OLDBFG43, @@ -1247,7 +1240,6 @@ typedef enum S_BSKUL_DIE6, S_BSKUL_DIE7, S_BSKUL_DIE8, -#endif S_MUSHROOM, // killough 10/98: mushroom explosion effect @@ -1417,16 +1409,12 @@ typedef enum { MT_PUSH, // controls push source // phares MT_PULL, // controls pull source // phares 3/20/98 -#ifdef DOGS MT_DOGS, // killough 7/19/98: Marine's best friend -#endif -#ifdef BETA MT_PLASMA1, // killough 7/11/98: first of alternating beta plasma fireballs MT_PLASMA2, // killough 7/11/98: second of alternating beta plasma fireballs MT_SCEPTRE, // killough 7/11/98: evil sceptre in beta version MT_BIBLE, // killough 7/11/98: unholy bible in beta version -#endif NUMMOBJTYPES // Counter of how many there are diff --git a/Source/m_cheat.c b/Source/m_cheat.c index ab2e14ef..f88259a0 100644 --- a/Source/m_cheat.c +++ b/Source/m_cheat.c @@ -81,10 +81,8 @@ static void cheat_nuke(); static void cheat_printstats(); // killough 8/23/98 #endif -#ifdef BETA static void cheat_autoaim(); // killough 7/19/98 static void cheat_tst(); -#endif //----------------------------------------------------------------------------- // @@ -238,7 +236,6 @@ struct cheat_s cheat[] = { {"nuke", NULL, not_net | not_demo, cheat_nuke }, // killough 12/98: disable nukage damage -#ifdef BETA {"aim", NULL, not_net | not_demo | beta_only, cheat_autoaim}, @@ -253,7 +250,6 @@ struct cheat_s cheat[] = { {"nc", NULL, not_net | not_demo | beta_only, cheat_noclip }, -#endif #ifdef INSTRUMENTED {"stat", NULL, always, @@ -273,7 +269,6 @@ static void cheat_printstats() // killough 8/23/98 } #endif -#ifdef BETA // killough 7/19/98: Autoaiming optional in beta emulation mode static void cheat_autoaim() { @@ -282,7 +277,6 @@ static void cheat_autoaim() "Projectile autoaiming on" : "Projectile autoaiming off"; } -#endif static void cheat_mus(buf) char buf[3]; @@ -348,13 +342,11 @@ static void cheat_god() plyr->message = s_STSTR_DQDOFF; // Ty 03/27/98 - externalized } -#ifdef BETA static void cheat_tst() { // killough 10/98: same as iddqd except for message cheat_god(); plyr->message = plyr->cheats & CF_GODMODE ? "God Mode On" : "God Mode Off"; } -#endif static void cheat_fa() { @@ -739,9 +731,7 @@ boolean M_FindCheats(int key) !(cheat[i].when & not_coop && netgame && !deathmatch) && !(cheat[i].when & not_demo && (demorecording || demoplayback)) && !(cheat[i].when & not_menu && menuactive) && -#ifdef BETA !(cheat[i].when & beta_only && !beta_emulation) && -#endif !(cheat[i].when & not_deh && cheat[i].deh_modified)) { if (cheat[i].arg < 0) // if additional args are required diff --git a/Source/m_menu.c b/Source/m_menu.c index 4afe6e5e..bb71baba 100644 --- a/Source/m_menu.c +++ b/Source/m_menu.c @@ -2529,10 +2529,8 @@ setup_menu_t weap_settings1[] = // Weapons Settings screen {"ENABLE RECOIL", S_YESNO,m_null,WP_X, WP_Y+ weap_recoil*8, {"weapon_recoil"}}, {"ENABLE BOBBING",S_YESNO,m_null,WP_X, WP_Y+weap_bobbing*8, {"player_bobbing"}}, -#ifdef BETA {"CLASSIC BFG" ,S_YESNO,m_null,WP_X, // killough 8/8/98 WP_Y+ weap_bfg*8, {"classic_bfg"}}, -#endif {"1ST CHOICE WEAPON",S_WEAP,m_null,WP_X,WP_Y+weap_pref1*8, {"weapon_choice_1"}}, {"2nd CHOICE WEAPON",S_WEAP,m_null,WP_X,WP_Y+weap_pref2*8, {"weapon_choice_2"}}, @@ -2871,15 +2869,11 @@ enum { enem_friction, enem_help_friends, -#ifdef DOGS enem_helpers, -#endif enem_distfriend, -#ifdef DOGS enem_dog_jumping, -#endif enem_end }; @@ -2904,7 +2898,6 @@ setup_menu_t enem_settings1[] = // Enemy Settings screen {"Rescue Dying Friends",S_YESNO,m_null,E_X,E_Y+ enem_help_friends*8, {"help_friends"}}, -#ifdef DOGS // killough 7/19/98 {"Number Of Single-Player Helper Dogs",S_NUM|S_LEVWARN,m_null,E_X,E_Y+ enem_helpers*8, {"player_helpers"}}, @@ -2912,7 +2905,6 @@ setup_menu_t enem_settings1[] = // Enemy Settings screen {"Distance Friends Stay Away",S_NUM,m_null,E_X,E_Y+ enem_distfriend*8, {"friend_distance"}}, {"Allow dogs to jump down",S_YESNO,m_null,E_X,E_Y+ enem_dog_jumping*8, {"dog_jumping"}}, -#endif // Button for resetting to defaults {0,S_RESET,m_null,X_BUTTON,Y_BUTTON}, diff --git a/Source/m_misc.c b/Source/m_misc.c index 7cda186f..c47641d7 100644 --- a/Source/m_misc.c +++ b/Source/m_misc.c @@ -220,14 +220,12 @@ default_t defaults[] = { "1 to enable recoil from weapon fire" }, -#ifdef BETA { // killough 7/19/98 "classic_bfg", (config_t *) &default_classic_bfg, (config_t *) &classic_bfg, {0}, {0,1}, number, ss_weap, wad_yes, "1 to enable pre-beta BFG2704" }, -#endif { // killough 10/98 "doom_weapon_toggles", @@ -292,8 +290,6 @@ default_t defaults[] = { "1 to enable monsters to help dying friends" }, -#ifdef DOGS - { // killough 7/19/98 "player_helpers", (config_t *) &default_dogs, (config_t *) &dogs, @@ -314,7 +310,6 @@ default_t defaults[] = { {1}, {0,1}, number, ss_enem, wad_yes, "1 to enable dogs to jump" }, -#endif { // no color changes on status bar "sts_always_red", diff --git a/Source/p_enemy.c b/Source/p_enemy.c index e33ee236..f8b18dcc 100644 --- a/Source/p_enemy.c +++ b/Source/p_enemy.c @@ -444,14 +444,12 @@ static boolean P_SmartMove(mobj_t *actor) // dropoff==1 means always allow it, dropoff==2 means only up to 128 high, // and only if the target is immediately on the other side of the line. -#ifdef DOGS if (actor->type == MT_DOGS && target && dog_jumping && !((target->flags ^ actor->flags) & MF_FRIEND) && P_AproxDistance(actor->x - target->x, actor->y - target->y) < FRACUNIT*144 && P_Random(pr_dropoff) < 235) dropoff = 2; -#endif if (!P_Move(actor, dropoff)) return false; @@ -1874,8 +1872,6 @@ void A_SkullAttack(mobj_t *actor) // killough 10/98: this emulates the beta version's lost soul attacks // -#ifdef BETA - void A_BetaSkullAttack(mobj_t *actor) { int damage; @@ -1896,8 +1892,6 @@ void A_Stop(mobj_t *actor) actor->momx = actor->momy = actor->momz = 0; } -#endif - // // A_PainShootSkull // Spawn a lost soul and launch it at the target diff --git a/Source/p_inter.c b/Source/p_inter.c index 77347c50..530c5dfe 100644 --- a/Source/p_inter.c +++ b/Source/p_inter.c @@ -303,13 +303,11 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher) // bonus items case SPR_BON1: -#ifdef BETA if (beta_emulation) { // killough 7/11/98: beta version items did not have any effect player->message = "You pick up a demonic dagger."; break; } -#endif player->health++; // can go over 100% if (player->health > (maxhealth * 2)) @@ -320,13 +318,11 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher) case SPR_BON2: -#ifdef BETA if (beta_emulation) { // killough 7/11/98: beta version items did not have any effect player->message = "You pick up a skullchest."; break; } -#endif player->armorpoints++; // can go over 100% if (player->armorpoints > max_armor) @@ -336,7 +332,6 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher) player->message = s_GOTARMBONUS; // Ty 03/22/98 - externalized break; -#ifdef BETA case SPR_BON3: // killough 7/11/98: evil sceptre from beta version player->message = "Picked up an evil sceptre"; break; @@ -344,7 +339,6 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher) case SPR_BON4: // killough 7/11/98: unholy bible from beta version player->message = "Picked up an unholy bible"; break; -#endif case SPR_SOUL: player->health += soul_health; @@ -446,10 +440,8 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher) return; player->message = s_GOTBERSERK; // Ty 03/22/98 - externalized if (player->readyweapon != wp_fist) -#ifdef BETA if (!beta_emulation // killough 10/98: don't switch as much in -beta || player->readyweapon == wp_pistol) -#endif player->pendingweapon = wp_fist; sound = sfx_getpow; break; @@ -465,10 +457,8 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher) if (!P_GivePower (player, pw_ironfeet)) return; -#ifdef BETA if (beta_emulation) // killough 7/19/98: beta rad suit did not wear off player->powers[pw_ironfeet] = -1; -#endif player->message = s_GOTSUIT; // Ty 03/22/98 - externalized sound = sfx_getpow; @@ -486,11 +476,9 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher) if (!P_GivePower (player, pw_infrared)) return; -#ifdef BETA // killough 7/19/98: light-amp visor did not wear off in beta if (beta_emulation) player->powers[pw_infrared] = -1; -#endif /* BETA */ sound = sfx_getpow; player->message = s_GOTVISOR; // Ty 03/22/98 - externalized @@ -570,10 +558,8 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher) if (!P_GiveWeapon (player, wp_bfg, false) ) return; player->message = -#ifdef BETA classic_bfg || beta_emulation ? "You got the BFG2704! Oh, yes." : // killough 8/9/98: beta BFG -#endif s_GOTBFG9000; // Ty 03/22/98 - externalized sound = sfx_wpnup; break; diff --git a/Source/p_mobj.c b/Source/p_mobj.c index 30ea3aa3..8a28f0a3 100644 --- a/Source/p_mobj.c +++ b/Source/p_mobj.c @@ -986,7 +986,6 @@ void P_SpawnMapThing (mapthing_t* mthing) if (mthing->type <= 4 && mthing->type > 0) // killough 2/26/98 -- fix crashes { -#ifdef DOGS // killough 7/19/98: Marine's best friend :) if (!netgame && mthing->type > 1 && mthing->type <= dogs+1 && !players[mthing->type-1].secretcount) @@ -998,7 +997,6 @@ void P_SpawnMapThing (mapthing_t* mthing) i = MT_DOGS; goto spawnit; } -#endif // save spots for respawning in network games playerstarts[mthing->type-1] = *mthing; @@ -1056,10 +1054,8 @@ void P_SpawnMapThing (mapthing_t* mthing) if (nomonsters && (i == MT_SKULL || (mobjinfo[i].flags & MF_COUNTKILL))) return; -#ifdef DOGS // spawn it spawnit: -#endif x = mthing->x << FRACBITS; y = mthing->y << FRACBITS; @@ -1214,9 +1210,7 @@ mobj_t* P_SpawnMissile(mobj_t* source,mobj_t* dest,mobjtype_t type) return th; } -#ifdef BETA int autoaim = 0; // killough 7/19/98: autoaiming was not in original beta -#endif // // P_SpawnPlayerMissile @@ -1233,9 +1227,7 @@ void P_SpawnPlayerMissile(mobj_t* source,mobjtype_t type) angle_t an = source->angle; // killough 7/19/98: autoaiming was not in original beta -#ifdef BETA if (!beta_emulation || autoaim) -#endif { // killough 8/2/98: prefer autoaiming at enemies int mask = demo_version < 203 ? 0 : MF_FRIEND; diff --git a/Source/p_pspr.c b/Source/p_pspr.c index f7c0df91..7a39bb10 100644 --- a/Source/p_pspr.c +++ b/Source/p_pspr.c @@ -82,11 +82,9 @@ static void P_SetPsprite(player_t *player, int position, statenum_t stnum) break; } -#ifdef BETA // killough 7/19/98: Pre-Beta BFG if (stnum == S_BFG1 && (classic_bfg || beta_emulation)) stnum = S_OLDBFG1; // Skip to alternative weapon frame -#endif state = &states[stnum]; psp->state = state; @@ -599,7 +597,6 @@ void A_FireBFG(player_t *player, pspdef_t *psp) void A_FireOldBFG(player_t *player, pspdef_t *psp) { -#ifdef BETA int type = MT_PLASMA1; if (weapon_recoil && !(player->mo->flags & MF_NOCLIP)) @@ -649,7 +646,6 @@ void A_FireOldBFG(player_t *player, pspdef_t *psp) P_CheckMissileSpawn(th); } while ((type != MT_PLASMA2) && (type = MT_PLASMA2)); //killough: obfuscated! -#endif } // @@ -661,13 +657,9 @@ void A_FirePlasma(player_t *player, pspdef_t *psp) player->ammo[weaponinfo[player->readyweapon].ammo]--; A_FireSomething(player, P_Random(pr_plasma) & 1); -#ifdef BETA // killough 7/11/98: emulate Doom's beta version, which alternated fireballs P_SpawnPlayerMissile(player->mo, beta_emulation ? player->refire&1 ? MT_PLASMA2 : MT_PLASMA1 : MT_PLASMA); -#else - P_SpawnPlayerMissile(player->mo, MT_PLASMA); -#endif } // @@ -795,12 +787,10 @@ void A_FireCGun(player_t *player, pspdef_t *psp) // The beta did not have fullscreen, and its chaingun sprites were chopped // off at the bottom for some strange reason. So we lower the sprite if // fullscreen is in use. -#ifdef BETA { if (beta_emulation && screenblocks>=11) player->psprites[ps_weapon].sy = FRACUNIT*48; } -#endif P_SetMobjState(player->mo, S_PLAY_ATK2); player->ammo[weaponinfo[player->readyweapon].ammo]--; diff --git a/Source/p_spec.c b/Source/p_spec.c index a24e25b9..701308dd 100644 --- a/Source/p_spec.c +++ b/Source/p_spec.c @@ -981,10 +981,8 @@ void P_CrossSpecialLine(line_t *line, int side, mobj_t *thing) case MT_TROOPSHOT: case MT_HEADSHOT: case MT_BRUISERSHOT: -#ifdef BETA case MT_PLASMA1: // killough 8/28/98: exclude beta fireballs case MT_PLASMA2: -#endif return; default: break; diff --git a/Source/p_spec.h b/Source/p_spec.h index 636cdd47..6ecfac84 100644 --- a/Source/p_spec.h +++ b/Source/p_spec.h @@ -53,11 +53,7 @@ #define PLATWAIT 3 -#ifdef BETA // killough 10/98: #define PLATSPEED (beta_emulation ? FRACUNIT/3 : FRACUNIT) -#else -#define PLATSPEED FRACUNIT -#endif // p_switch diff --git a/Source/p_telept.c b/Source/p_telept.c index 7df2bfa6..d4ef88be 100644 --- a/Source/p_telept.c +++ b/Source/p_telept.c @@ -93,12 +93,8 @@ int EV_Teleport(line_t *line, int side, mobj_t *thing) sfx_telept); if (thing->player) // don't move for a bit // killough 10/98 -#ifdef BETA // killough 10/98: beta teleporters were a bit faster thing->reactiontime = beta_emulation ? 4 : 18; -#else - thing->reactiontime = 18; -#endif thing->angle = m->angle; diff --git a/Source/p_user.c b/Source/p_user.c index 616dfb16..6b417fd5 100644 --- a/Source/p_user.c +++ b/Source/p_user.c @@ -439,7 +439,6 @@ void P_PlayerThink (player_t* player) player->fixedcolormap = -#ifdef BETA beta_emulation ? /* Beta Emulation */ player->powers[pw_infrared] > 4*32 || player->powers[pw_infrared] & 8 ? 32 : @@ -448,7 +447,6 @@ void P_PlayerThink (player_t* player) (player->powers[pw_invulnerability] < 4*32 && player->powers[pw_invulnerability] > 0 && player->powers[pw_invulnerability] & 8) ? 33 : 0 : -#endif player->powers[pw_invulnerability] > 4*32 || /* Regular Doom */ player->powers[pw_invulnerability] & 8 ? INVERSECOLORMAP : diff --git a/Source/r_things.c b/Source/r_things.c index 706f044c..e743a26f 100644 --- a/Source/r_things.c +++ b/Source/r_things.c @@ -682,14 +682,9 @@ void R_DrawPSprite (pspdef_t *psp) vis->patch = lump; -#ifdef BETA // killough 7/11/98: beta psprites did not draw shadows if ((viewplayer->powers[pw_invisibility] > 4*32 || viewplayer->powers[pw_invisibility] & 8) && !beta_emulation) -#else - if (viewplayer->powers[pw_invisibility] > 4*32 - || viewplayer->powers[pw_invisibility] & 8) -#endif vis->colormap = NULL; // shadow draw else if (fixedcolormap) diff --git a/Source/sounds.c b/Source/sounds.c index 0c50a6ae..5cda755e 100644 --- a/Source/sounds.c +++ b/Source/sounds.c @@ -226,14 +226,12 @@ sfxinfo_t S_sfx[] = { { "skeatk", sg_none, 70, 0, -1, -1, 0 }, { "radio", sg_none, 60, 0, -1, -1, 0 }, -#ifdef DOGS // killough 11/98: dog sounds { "dgsit", sg_none, 98, 0, -1, -1, 0 }, { "dgatk", sg_none, 70, 0, -1, -1, 0 }, { "dgact", sg_none, 120, 0, -1, -1, 0 }, { "dgdth", sg_none, 70, 0, -1, -1, 0 }, { "dgpain", sg_none, 96, 0, -1, -1, 0 }, -#endif }; //---------------------------------------------------------------------------- diff --git a/Source/sounds.h b/Source/sounds.h index 86d11af8..0ac051ef 100644 --- a/Source/sounds.h +++ b/Source/sounds.h @@ -301,14 +301,12 @@ typedef enum { sfx_skeatk, sfx_radio, -#ifdef DOGS // killough 11/98: dog sounds sfx_dgsit, sfx_dgatk, sfx_dgact, sfx_dgdth, sfx_dgpain, -#endif NUMSFX } sfxenum_t; diff --git a/Source/st_stuff.c b/Source/st_stuff.c index c3f3ed64..7f41b271 100644 --- a/Source/st_stuff.c +++ b/Source/st_stuff.c @@ -639,10 +639,8 @@ void ST_doPaletteStuff(void) byte* pal; int cnt = plyr->damagecount; -#ifdef BETA // killough 7/14/98: beta version did not cause red berserk palette if (!beta_emulation) -#endif if (plyr->powers[pw_strength]) { @@ -668,12 +666,10 @@ void ST_doPaletteStuff(void) palette += STARTBONUSPALS; } else -#ifdef BETA // killough 7/14/98: beta version did not cause green palette if (beta_emulation) palette = 0; else -#endif if (plyr->powers[pw_ironfeet] > 4*32 || plyr->powers[pw_ironfeet] & 8) palette = RADIATIONPAL; else diff --git a/configure.ac b/configure.ac index fa5cc544..f415d82d 100644 --- a/configure.ac +++ b/configure.ac @@ -56,12 +56,6 @@ AC_FUNC_ALLOCA AC_FUNC_ERROR_AT_LINE AC_CHECK_FUNCS([atexit memmove memset mkdir pow putenv strcasecmp strchr strdup strerror strncasecmp strrchr strstr strtol]) -AC_ARG_ENABLE([dogs], AS_HELP_STRING([--disable-dogs], [Disable support for helper dogs])) -AS_IF([test "x$enable_dogs" != "xno"], [AC_DEFINE([DOGS], [1], [Support for helper dogs])]) - -AC_ARG_ENABLE([beta], AS_HELP_STRING([--disable-beta], [Disable support for beta emulation])) -AS_IF([test "x$enable_beta" != "xno"], [AC_DEFINE([BETA], [1], [Support for beta emulation])]) - # Set compiler flags WARNINGS="-Wall -Wdeclaration-after-statement -Wredundant-decls"