Skip to content

Commit

Permalink
Revert "get rid of doom_weapon_toggles"
Browse files Browse the repository at this point in the history
This reverts commit 36f6408.
  • Loading branch information
fabiangreffrath committed Sep 13, 2024
1 parent 57c23e5 commit 7a4d166
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/g_game.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ boolean mouselook = false;
boolean padlook = false;
// killough 4/13/98: Make clock rate adjustable by scale factor
int realtic_clock_rate = 100;
static boolean doom_weapon_toggles;

complevel_t force_complevel, default_complevel;

Expand Down Expand Up @@ -759,7 +760,7 @@ void G_BuildTiccmd(ticcmd_t* cmd)
// killough 10/98: make SG/SSG and Fist/Chainsaw
// weapon toggles optional

if (!demo_compatibility)
if (!demo_compatibility && doom_weapon_toggles)
{
const player_t *player = &players[consoleplayer];

Expand Down Expand Up @@ -4664,6 +4665,9 @@ void G_BindWeapVariables(void)
M_BindBool("weapon_recoil", &default_weapon_recoil, &weapon_recoil,
false, ss_none, wad_yes,
"Physical recoil from weapon fire (affects compatibility)");
M_BindBool("doom_weapon_toggles", &doom_weapon_toggles, NULL,
true, ss_weap, wad_no,
"Allow toggling between SG/SSG and Fist/Chainsaw");
M_BindBool("player_bobbing", &default_player_bobbing, &player_bobbing,
true, ss_none, wad_no, "Physical player bobbing (affects compatibility)");

Expand Down
2 changes: 2 additions & 0 deletions src/mn_setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -1549,6 +1549,8 @@ static setup_menu_t weap_settings2[] = {
{"8Th Choice Weapon", S_WEAP | S_BOOM, OFF_CNTR_X, M_SPC, {"weapon_choice_8"}},
{"9Th Choice Weapon", S_WEAP | S_BOOM, OFF_CNTR_X, M_SPC, {"weapon_choice_9"}},
MI_GAP,
{"Use Weapon Toggles", S_ONOFF | S_BOOM, OFF_CNTR_X, M_SPC, {"doom_weapon_toggles"}},
MI_GAP,
// killough 8/8/98
{"Pre-Beta BFG", S_ONOFF | S_STRICT, OFF_CNTR_X, M_SPC, {"classic_bfg"}},
MI_END
Expand Down

0 comments on commit 7a4d166

Please sign in to comment.