Skip to content

Commit

Permalink
Added always stock menu toggle
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rex109
Rex109 committed Jan 10, 2024
1 parent 975aeaa commit 82dbf47
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 26 deletions.
2 changes: 2 additions & 0 deletions cod4qol/commands.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ void commands::InitializeCommands()

qol_ambient = game::Dvar_RegisterBool("qol_ambient", 1, game::dvar_flags::saved, "Enable ambient sound/music cues.");

qol_stockmenu = game::Dvar_RegisterBool("qol_stockmenu", 0, game::dvar_flags::saved, "Load the stock menu even with a mod loaded.");

std::cout << "Commands initialized!" << std::endl;
}

Expand Down
1 change: 1 addition & 0 deletions cod4qol/commands.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ namespace commands
inline game::dvar_s* qol_mirrorgun;
inline game::dvar_s* qol_disable_steam_auth;
inline game::dvar_s* qol_ambient;
inline game::dvar_s* qol_stockmenu;

void InitializeCommands();

Expand Down
4 changes: 2 additions & 2 deletions cod4qol/game.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ void game::hookedDB_LoadXZoneFromGfxConfig()

game::Sys_CreateConsole(0x0);

if (!strcmp(fs_game->current.string, ""))
if (!strcmp(fs_game->current.string, "") || commands::qol_stockmenu->current.enabled)
game::Cbuf_AddText("loadzone qol\n", 0);

commands::InitializeCommands();
Expand All @@ -47,7 +47,7 @@ void game::hookedCom_LoadUiFastFile()
{
std::cout << "Calling Com_LoadUiFastFile();" << std::endl;

if (!strcmp(fs_game->current.string, ""))
if (!strcmp(fs_game->current.string, "") || commands::qol_stockmenu->current.enabled)
game::Cbuf_AddText("loadzone qol\n", 0);

return game::pCom_LoadUiFastFile();
Expand Down
Binary file modified mod/cod4qol/mod.ff
View file
Binary file not shown.
49 changes: 25 additions & 24 deletions mod/cod4qol/ui/options_sound_pc.menu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,36 +95,37 @@ itemDef { \
CHOICE_DVARSLIDER_VIS_EXTR( 22, "Fov", cg_fov, 80, 65, 90, ;, ;, when( localVarInt ( ui_qol ) == 1 );)
CHOICE_DVARSLIDER_VIS_EXTR( 23, "Fovscale", cg_fovscale, 1, 0.2, 2, setLocalVarBool ui_showApply 1, ;, when( localVarInt ( ui_qol ) == 1 );)
//CHOICE_SEPARATOR_VIS( CHOICE_SEP_1, when( localVarInt ( ui_qol ) == 1 ); )
CHOICE_DVARFLOATLIST_VIS( 24, "Fullbright", r_fullbright, { "@MENU_ON" 1 "@MENU_OFF" 0 }, setLocalVarBool ui_showApply 1, when( localVarInt ( ui_qol ) == 1 ))
CHOICE_DVARFLOATLIST_VIS( 25, "Fullscreen", r_fullscreen, { "@MENU_ON" 1 "@MENU_OFF" 0 }, exec "vid_restart";, when( localVarInt ( ui_qol ) == 1 ))
CHOICE_DVARFLOATLIST_VIS( 26, "Max fps", com_maxfps, { "@MPUI_RULES_UNLIMITED" 0 "30" 30 "60" 60 "125" 125 "142" 142 "250" 250 "333" 333 "500" 500 }, ;, when( localVarInt ( ui_qol ) == 1 ))
CHOICE_DVARSTRINGLIST_VIS( 27, "Draw fps", cg_drawfps, { "@MENU_OFF"; "Off"; "Simple"; "Simple"; "SimpleRanges"; "SimpleRanges"; "Verbose"; "Verbose" }, ;, when( localVarInt ( ui_qol ) == 1 ))
CHOICE_DVARFLOATLIST_VIS( 24, "Fullbright", r_fullbright, { "@MENU_ON" 1 "@MENU_OFF" 0 }, setLocalVarBool ui_showApply 1, when( localVarInt ( ui_qol ) == 1 );)
CHOICE_DVARFLOATLIST_VIS( 25, "Fullscreen", r_fullscreen, { "@MENU_ON" 1 "@MENU_OFF" 0 }, exec "vid_restart";, when( localVarInt ( ui_qol ) == 1 );)
CHOICE_DVARFLOATLIST_VIS( 26, "Max fps", com_maxfps, { "@MPUI_RULES_UNLIMITED" 0 "30" 30 "60" 60 "125" 125 "142" 142 "250" 250 "333" 333 "500" 500 }, ;, when( localVarInt ( ui_qol ) == 1 );)
CHOICE_DVARSTRINGLIST_VIS( 27, "Draw fps", cg_drawfps, { "@MENU_OFF"; "Off"; "Simple"; "Simple"; "SimpleRanges"; "SimpleRanges"; "Verbose"; "Verbose" }, ;, when( localVarInt ( ui_qol ) == 1 );)
//CHOICE_SEPARATOR_VIS( CHOICE_SEP_2, when( localVarInt ( ui_qol ) == 1 ); )
CHOICE_DVARFLOATLIST_VIS( 28, "Draw distance", r_zfar, { "@MPUI_RULES_UNLIMITED" 0 "@MENU_NORMAL" 3000 "@MENU_LOW" 2000 "Extra low" 1000 "Ultra low" 500 "^1Unnecessary low" 1 }, setLocalVarBool ui_showApply 1, when( localVarInt ( ui_qol ) == 1 ))
CHOICE_DVARFLOATLIST_VIS( 29, "Lod scale rigid", r_lodScaleRigid, { "@MENU_NORMAL" 1 "@MENU_LOW" 2 "Extra low" 3 "Ultra low" 4 }, ;, when( localVarInt ( ui_qol ) == 1 ))
CHOICE_DVARFLOATLIST_VIS( 30, "Lod scale skinned", r_lodScaleSkinned, { "@MENU_NORMAL" 1 "@MENU_LOW" 2 "Extra low" 3 "Ultra low" 4 }, ;, when( localVarInt ( ui_qol ) == 1 ))
CHOICE_DVARFLOATLIST_VIS( 31, "Film use tweaks", r_filmusetweaks, { "@MENU_ON" 1 "@MENU_OFF" 0 }, setLocalVarBool ui_showApply 1, when( localVarInt ( ui_qol ) == 1 ))
CHOICE_DVARSLIDER_VIS_EXTR( 32, "Gun X Position", cg_gun_x, 0, -100, 100, setLocalVarBool ui_showApply 1, ;, when( localVarInt ( ui_qol ) == 1 );)
CHOICE_DVARSLIDER_VIS_EXTR( 33, "Gun Y Position", cg_gun_y, 0, -100, 100, setLocalVarBool ui_showApply 1, ;, when( localVarInt ( ui_qol ) == 1 );)
CHOICE_DVARSLIDER_VIS_EXTR( 34, "Gun Z Position", cg_gun_z, 0, -100, 100, setLocalVarBool ui_showApply 1, ;, when( localVarInt ( ui_qol ) == 1 );)
CHOICE_DVARFLOATLIST_VIS( 35, "Gun handedness", qol_mirrorgun, { "Left" 1 "Right" 0 }, ;, when( localVarInt ( ui_qol ) == 1 ))
CHOICE_DVARFLOATLIST_VIS( 28, "Draw distance", r_zfar, { "@MPUI_RULES_UNLIMITED" 0 "@MENU_NORMAL" 3000 "@MENU_LOW" 2000 "Extra low" 1000 "Ultra low" 500 "^1Unnecessary low" 1 }, setLocalVarBool ui_showApply 1, when( localVarInt ( ui_qol ) == 1 );)
//CHOICE_DVARFLOATLIST_VIS( 29, "Lod scale rigid", r_lodScaleRigid, { "@MENU_NORMAL" 1 "@MENU_LOW" 2 "Extra low" 3 "Ultra low" 4 }, ;, when( localVarInt ( ui_qol ) == 1 );)
CHOICE_DVARFLOATLIST_VIS( 29, "Lod scale skinned", r_lodScaleSkinned, { "@MENU_NORMAL" 1 "@MENU_LOW" 2 "Extra low" 3 "Ultra low" 4 }, ;, when( localVarInt ( ui_qol ) == 1 );)
CHOICE_DVARFLOATLIST_VIS( 30, "Film use tweaks", r_filmusetweaks, { "@MENU_ON" 1 "@MENU_OFF" 0 }, setLocalVarBool ui_showApply 1, when( localVarInt ( ui_qol ) == 1 );)
CHOICE_DVARSLIDER_VIS_EXTR( 31, "Gun X Position", cg_gun_x, 0, -100, 100, setLocalVarBool ui_showApply 1, ;, when( localVarInt ( ui_qol ) == 1 );)
CHOICE_DVARSLIDER_VIS_EXTR( 32, "Gun Y Position", cg_gun_y, 0, -100, 100, setLocalVarBool ui_showApply 1, ;, when( localVarInt ( ui_qol ) == 1 );)
CHOICE_DVARSLIDER_VIS_EXTR( 33, "Gun Z Position", cg_gun_z, 0, -100, 100, setLocalVarBool ui_showApply 1, ;, when( localVarInt ( ui_qol ) == 1 );)
CHOICE_DVARFLOATLIST_VIS( 34, "Gun handedness", qol_mirrorgun, { "Left" 1 "Right" 0 }, ;, when( localVarInt ( ui_qol ) == 1 );)

//Privacy settings

CHOICE_SECTION_TITLE_VIS( 21, "Privacy settings...", when( localVarInt ( ui_qol ) == 2 ))
CHOICE_DVARSTRINGLIST_VIS( 22, "Screenshot protection", qol_getss, { "@MENU_OFF"; "Off"; "Notify"; "Notify"; "Notify + Block"; "Notify + Block" }, ;, when( localVarInt ( ui_qol ) == 2 ))
CHOICE_DVARFLOATLIST_VIS( 23, "Block vstr", qol_vstr_block, { "@MENU_OFF" 0 "@MENU_ON" 1 }, ;, when( localVarInt ( ui_qol ) == 2 ))
CHOICE_DVARFLOATLIST_VIS( 24, "Disable steam auth", qol_disable_steam_auth, { "@MENU_OFF" 0 "@MENU_ON" 1 }, exec "togglesteamauthupdate"; execondvarintvalue qol_disable_steam_auth 0 "set ui_qol_restart 1";, when( localVarInt ( ui_qol ) == 2 ))
PREPROC_TEXT_DRAW_ALIGNED_EXTR( CHOICE_ORIGIN( 26 ) 300 80 CHOICE_HORIZONTAL_ALIGN CHOICE_VERTICAL_ALIGN, 0 0, text "^3You may need to restart your game", TEXTSIZE_SMALL, 0, 0, ITEM_ALIGN_CENTER, CHOICE_TEXTCOLOR autowrapped, when( localVarInt ( ui_qol ) == 2 && dvarInt ( ui_qol_restart ) == 1 ) )
CHOICE_SECTION_TITLE_VIS( 21, "Privacy settings...", when( localVarInt ( ui_qol ) == 2 );)
CHOICE_DVARSTRINGLIST_VIS( 22, "Screenshot protection", qol_getss, { "@MENU_OFF"; "Off"; "Notify"; "Notify"; "Notify + Block"; "Notify + Block" }, ;, when( localVarInt ( ui_qol ) == 2 );)
CHOICE_DVARFLOATLIST_VIS( 23, "Block vstr", qol_vstr_block, { "@MENU_OFF" 0 "@MENU_ON" 1 }, ;, when( localVarInt ( ui_qol ) == 2 );)
CHOICE_DVARFLOATLIST_VIS( 24, "Disable steam auth", qol_disable_steam_auth, { "@MENU_OFF" 0 "@MENU_ON" 1 }, exec "togglesteamauthupdate"; execondvarintvalue qol_disable_steam_auth 0 "set ui_qol_restart 1";, when( localVarInt ( ui_qol ) == 2 );)
PREPROC_TEXT_DRAW_ALIGNED_EXTR( CHOICE_ORIGIN( 26 ) 300 80 CHOICE_HORIZONTAL_ALIGN CHOICE_VERTICAL_ALIGN, 0 0, text "^3You may need to restart your game", TEXTSIZE_SMALL, 0, 0, ITEM_ALIGN_CENTER, CHOICE_TEXTCOLOR autowrapped, when( localVarInt ( ui_qol ) == 2 && dvarInt ( ui_qol_restart ) == 1 );)

//CoD4QOL settings

CHOICE_SECTION_TITLE_VIS( 21, "CoD4QOL settings...", when( localVarInt ( ui_qol ) == 3 ))
CHOICE_DVARFLOATLIST_VIS( 22, "Check for updates on startup", qol_check_updates, { "@MENU_OFF" 0 "@MENU_ON" 1 }, ;, when( localVarInt ( ui_qol ) == 3 ))
CHOICE_DVARFLOATLIST_VIS( 23, "Show external console", qol_show_console, { "@MENU_OFF" 0 "@MENU_ON" 1 }, exec "toggleconsoleupdate";, when( localVarInt ( ui_qol ) == 3 ))
CHOICE_DVARFLOATLIST_VIS( 24, "Display loading info", qol_show_loading, { "@MENU_OFF" 0 "@MENU_ON" 1 }, exec "toggleloadinginfoupdate";, when( localVarInt ( ui_qol ) == 3 ))
CHOICE_DVARFLOATLIST_VIS( 25, "Play ambient music", qol_ambient, { "@MENU_OFF" 0 "@MENU_ON" 1 }, ;, when( localVarInt ( ui_qol ) == 3 ))
CHOICE_DVARFLOATLIST_VIS( 26, "Raw input", raw_input, { "@MENU_OFF" 0 "@MENU_ON" 1 }, ;, when( localVarInt ( ui_qol ) == 3 ))
CHOICE_SECTION_TITLE_VIS( 21, "CoD4QOL settings...", when( localVarInt ( ui_qol ) == 3 );)
CHOICE_DVARFLOATLIST_VIS( 22, "Check for updates on startup", qol_check_updates, { "@MENU_OFF" 0 "@MENU_ON" 1 }, ;, when( localVarInt ( ui_qol ) == 3 );)
CHOICE_DVARFLOATLIST_VIS( 23, "Show external console", qol_show_console, { "@MENU_OFF" 0 "@MENU_ON" 1 }, exec "toggleconsoleupdate";, when( localVarInt ( ui_qol ) == 3 );)
CHOICE_DVARFLOATLIST_VIS( 24, "Display loading info", qol_show_loading, { "@MENU_OFF" 0 "@MENU_ON" 1 }, exec "toggleloadinginfoupdate";, when( localVarInt ( ui_qol ) == 3 );)
CHOICE_DVARFLOATLIST_VIS( 25, "Play ambient music", qol_ambient, { "@MENU_OFF" 0 "@MENU_ON" 1 }, ;, when( localVarInt ( ui_qol ) == 3 );)
CHOICE_DVARFLOATLIST_VIS( 26, "Raw input", raw_input, { "@MENU_OFF" 0 "@MENU_ON" 1 }, ;, when( localVarInt ( ui_qol ) == 3 );)
CHOICE_DVARFLOATLIST_VIS( 27, "Always load stock menu", qol_stockmenu, { "@MENU_OFF" 0 "@MENU_ON" 1 }, ;, when( localVarInt ( ui_qol ) == 3 );)

itemDef
{
Expand Down

0 comments on commit 82dbf47

Please sign in to comment.