AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-23 03:52:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Reorganize weapons options (#2029)

Browse Source
This commit is contained in:
ceski 2024-11-18 06:14:54 -08:00 committed by GitHub
parent 0d5505bce4
commit e5d2d94c6f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/mn_setup.c
View File

@ -1532,9 +1532,9 @@ void MN_DrawKeybnd(void)
// The Weapon Screen tables. // The Weapon Screen tables.
static setup_tab_t weap_tabs[] = { static setup_tab_t weap_tabs[] = {
{"cosmetic"}, {"Prefs"},
{"slots"}, {"Slots"},
{"preferences"}, {"Priority"},
{NULL} {NULL}
}; };
@ -1547,14 +1547,29 @@ static const char *bobbing_pct_strings[] = {"0%", "25%", "50%", "75%", "100%"};
static setup_menu_t weap_settings1[] = { static setup_menu_t weap_settings1[] = {
{"Gameplay", S_SKIP | S_TITLE, CNTR_X, M_SPC},
{"Weapon Carousel", S_ONOFF, CNTR_X, M_SPC, {"weapon_carousel"}},
{"Vanilla Weapon Cycle", S_ONOFF | S_BOOM, CNTR_X, M_SPC,
{"doom_weapon_cycle"}},
{"Use Weapon Toggles", S_ONOFF | S_BOOM, CNTR_X, M_SPC,
{"doom_weapon_toggles"}},
// killough 8/8/98
{"Pre-Beta BFG", S_ONOFF | S_STRICT, CNTR_X, M_SPC, {"classic_bfg"}},
MI_GAP,
{"Cosmetic", S_SKIP | S_TITLE, CNTR_X, M_SPC},
{"View Bob", S_THERMO, CNTR_X, M_THRM_SPC, {"view_bobbing_pct"}, {"View Bob", S_THERMO, CNTR_X, M_THRM_SPC, {"view_bobbing_pct"},
.strings_id = str_bobbing_pct}, .strings_id = str_bobbing_pct},
{"Weapon Bob", S_THERMO, CNTR_X, M_THRM_SPC, {"weapon_bobbing_pct"}, {"Weapon Bob", S_THERMO, CNTR_X, M_THRM_SPC, {"weapon_bobbing_pct"},
.strings_id = str_bobbing_pct, .action = UpdateCenteredWeaponItem}, .strings_id = str_bobbing_pct, .action = UpdateCenteredWeaponItem},
MI_GAP,
// [FG] centered or bobbing weapon sprite // [FG] centered or bobbing weapon sprite
{"Weapon Alignment", S_CHOICE | S_STRICT, CNTR_X, M_SPC, {"center_weapon"}, {"Weapon Alignment", S_CHOICE | S_STRICT, CNTR_X, M_SPC, {"center_weapon"},
.strings_id = str_center_weapon}, .strings_id = str_center_weapon},
@ -1722,21 +1737,15 @@ static void UpdateWeaponSlotItems(void)
} }
static setup_menu_t weap_settings3[] = { static setup_menu_t weap_settings3[] = {
{"1St Choice Weapon", S_WEAP | S_BOOM, M_X, M_SPC, {"weapon_choice_1"}}, {"1st Choice Weapon", S_WEAP | S_BOOM, OFF_CNTR_X, M_SPC, {"weapon_choice_1"}},
{"2Nd Choice Weapon", S_WEAP | S_BOOM, M_X, M_SPC, {"weapon_choice_2"}}, {"2nd Choice Weapon", S_WEAP | S_BOOM, OFF_CNTR_X, M_SPC, {"weapon_choice_2"}},
{"3Rd Choice Weapon", S_WEAP | S_BOOM, M_X, M_SPC, {"weapon_choice_3"}}, {"3rd Choice Weapon", S_WEAP | S_BOOM, OFF_CNTR_X, M_SPC, {"weapon_choice_3"}},
{"4Th Choice Weapon", S_WEAP | S_BOOM, M_X, M_SPC, {"weapon_choice_4"}}, {"4th Choice Weapon", S_WEAP | S_BOOM, OFF_CNTR_X, M_SPC, {"weapon_choice_4"}},
{"5Th Choice Weapon", S_WEAP | S_BOOM, M_X, M_SPC, {"weapon_choice_5"}}, {"5th Choice Weapon", S_WEAP | S_BOOM, OFF_CNTR_X, M_SPC, {"weapon_choice_5"}},
{"6Th Choice Weapon", S_WEAP | S_BOOM, M_X, M_SPC, {"weapon_choice_6"}}, {"6th Choice Weapon", S_WEAP | S_BOOM, OFF_CNTR_X, M_SPC, {"weapon_choice_6"}},
{"7Th Choice Weapon", S_WEAP | S_BOOM, M_X, M_SPC, {"weapon_choice_7"}}, {"7th Choice Weapon", S_WEAP | S_BOOM, OFF_CNTR_X, M_SPC, {"weapon_choice_7"}},
{"8Th Choice Weapon", S_WEAP | S_BOOM, M_X, M_SPC, {"weapon_choice_8"}}, {"8th Choice Weapon", S_WEAP | S_BOOM, OFF_CNTR_X, M_SPC, {"weapon_choice_8"}},
{"9Th Choice Weapon", S_WEAP | S_BOOM, M_X, M_SPC, {"weapon_choice_9"}}, {"9th Choice Weapon", S_WEAP | S_BOOM, OFF_CNTR_X, M_SPC, {"weapon_choice_9"}},
MI_GAP,
{"Same Key Toggles Weapons", S_ONOFF | S_BOOM, M_X, M_SPC, {"doom_weapon_toggles"}},
{"Vanilla Weapon Cycle", S_ONOFF | S_BOOM, M_X, M_SPC, {"doom_weapon_cycle"}},
MI_GAP,
// killough 8/8/98
{"Pre-Beta BFG", S_ONOFF | S_STRICT, M_X, M_SPC, {"classic_bfg"}},
MI_END MI_END
}; };
@ -1842,10 +1851,6 @@ static setup_menu_t stat_settings1[] = {
{"Animated Health/Armor Count", S_ONOFF, H_X, M_SPC, {"hud_animated_counts"}}, {"Animated Health/Armor Count", S_ONOFF, H_X, M_SPC, {"hud_animated_counts"}},
MI_GAP,
{"Weapon Carousel", S_ONOFF, H_X, M_SPC, {"weapon_carousel"}},
MI_RESET, MI_RESET,
MI_END MI_END