From 32bbcbf69e41c2f27152b7c691c2612e84f18296 Mon Sep 17 00:00:00 2001 From: Diavolo Date: Fri, 15 Dec 2023 18:02:18 +0100 Subject: [PATCH] fix(menus): use OAT to track down mistakes and fix them --- iw4x/iw4x_00/ui_mp/bg.inc | 2 +- iw4x/iw4x_00/ui_mp/cac_popup.menu | 4 +- iw4x/iw4x_00/ui_mp/connect.menu | 7 +- iw4x/iw4x_00/ui_mp/controls_multi.menu | 46 +-- iw4x/iw4x_00/ui_mp/createserver.menu | 68 ++--- iw4x/iw4x_00/ui_mp/dpad_hd.menu | 6 - iw4x/iw4x_00/ui_mp/iw4x_credits.menu | 36 +-- iw4x/iw4x_00/ui_mp/main_text.menu | 12 +- iw4x/iw4x_00/ui_mp/menu_online_barracks.menu | 270 +++++++++--------- iw4x/iw4x_00/ui_mp/menu_xboxlive_lobby.menu | 192 +++++++------ .../ui_mp/menu_xboxlive_privatelobby.menu | 3 +- iw4x/iw4x_00/ui_mp/mods_menu.menu | 100 +++---- iw4x/iw4x_00/ui_mp/pc_join_unranked.menu | 52 ++-- iw4x/iw4x_00/ui_mp/pc_options_actions.menu | 76 ++--- .../ui_mp/pc_options_advanced_video.menu | 68 ++--- iw4x/iw4x_00/ui_mp/pc_options_audio.menu | 40 +-- iw4x/iw4x_00/ui_mp/pc_options_controls.menu | 118 ++++---- iw4x/iw4x_00/ui_mp/pc_options_game.menu | 44 +-- iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu | 86 +++--- iw4x/iw4x_00/ui_mp/pc_options_look.menu | 94 +++--- iw4x/iw4x_00/ui_mp/pc_options_movement.menu | 74 ++--- iw4x/iw4x_00/ui_mp/pc_options_multi.menu | 54 ++-- iw4x/iw4x_00/ui_mp/pc_options_video.menu | 130 ++++----- iw4x/iw4x_00/ui_mp/popup_customclan.menu | 36 +-- iw4x/iw4x_00/ui_mp/popup_customtitle.menu | 36 +-- iw4x/iw4x_00/ui_mp/popup_friends.menu | 82 +++--- iw4x/iw4x_00/ui_mp/popup_joinpassword.menu | 39 +-- iw4x/iw4x_00/ui_mp/popup_playername.menu | 38 +-- iw4x/iw4x_00/ui_mp/popup_serverpassword.menu | 36 +-- .../ui_mp/scriptmenus/changegametype.menu | 2 +- iw4x/iw4x_00/ui_mp/scriptmenus/changemap.menu | 2 +- .../iw4x_00/ui_mp/scriptmenus/kickplayer.menu | 2 +- iw4x/iw4x_00/ui_mp/serverinfo_popmenu.menu | 214 +++++++------- iw4x/iw4x_00/ui_mp/settings_gametype.menu | 23 +- iw4x/iw4x_00/ui_mp/theater_menu.menu | 100 +++---- 35 files changed, 1106 insertions(+), 1086 deletions(-) diff --git a/iw4x/iw4x_00/ui_mp/bg.inc b/iw4x/iw4x_00/ui_mp/bg.inc index 5ec254f..903910a 100644 --- a/iw4x/iw4x_00/ui_mp/bg.inc +++ b/iw4x/iw4x_00/ui_mp/bg.inc @@ -34,7 +34,7 @@ itemDef forecolor 0 0 0 0.4 background "white" textscale 0.55 - visible when ((dvarBool("cl_ingame") || dvarBool("sv_running"))) + visible when ( dvarBool("cl_ingame") || dvarBool("sv_running") ) } itemDef { diff --git a/iw4x/iw4x_00/ui_mp/cac_popup.menu b/iw4x/iw4x_00/ui_mp/cac_popup.menu index e776399..e47ae5b 100644 --- a/iw4x/iw4x_00/ui_mp/cac_popup.menu +++ b/iw4x/iw4x_00/ui_mp/cac_popup.menu @@ -10,7 +10,7 @@ style 1 foreColor 1 1 1 1 backColor 1 1 1 1 - background white + background "white" exp rect Y ( localvarfloat( "ui_cac_popup_ypos" ) ) exp rect H ( CALCULATED_HEIGHT ) fadeCycle 1 @@ -66,7 +66,7 @@ background white decoration visible 1 - exp rect H ( ) + exp rect H ( CALCULATED_HEIGHT ) } itemDef { diff --git a/iw4x/iw4x_00/ui_mp/connect.menu b/iw4x/iw4x_00/ui_mp/connect.menu index a3253a5..c7de995 100644 --- a/iw4x/iw4x_00/ui_mp/connect.menu +++ b/iw4x/iw4x_00/ui_mp/connect.menu @@ -258,7 +258,9 @@ text "@MENU_INTEL" visible when ( dvarbool( "wideScreen" ) ) } - /*itemDef + +#ifdef DRAW_IW_LOGO + itemDef { //rect -104 -56 128 64 3 3 rect -170 -66 128 64 3 3 @@ -280,6 +282,7 @@ background "logo_iw" textscale 0.55 visible when ( !dvarbool( "wideScreen" ) ) - }*/ + } +#endif } } \ No newline at end of file diff --git a/iw4x/iw4x_00/ui_mp/controls_multi.menu b/iw4x/iw4x_00/ui_mp/controls_multi.menu index 3e9d78c..aada9fd 100644 --- a/iw4x/iw4x_00/ui_mp/controls_multi.menu +++ b/iw4x/iw4x_00/ui_mp/controls_multi.menu @@ -40,34 +40,36 @@ #define ON_MENU_ESC \ close self; -menuDef { - name MENU_NAME - rect 0 0 640 480 - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - blurWorld 7 + menuDef + { + name MENU_NAME + rect 0 0 640 480 + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + blurWorld 7 - MENU_ON_OPEN(ON_MENU_OPEN) - MENU_ON_CLOSE(ON_MENU_CLOSE) - MENU_ON_ESC(ON_MENU_ESC) + MENU_ON_OPEN(ON_MENU_OPEN) + MENU_ON_CLOSE(ON_MENU_CLOSE) + MENU_ON_ESC(ON_MENU_ESC) - #define BACKGROUND_PC_OPTIONS - #define BACKGROUND_IW4 - #define DISABLE_SIDEBAR - #define BACKGROUND_FULL - #include "ui_mp/bg.inc" + #define BACKGROUND_PC_OPTIONS + #define BACKGROUND_IW4 + #define DISABLE_SIDEBAR + #define BACKGROUND_FULL + #include "ui_mp/bg.inc" - PC_OPTIONS_SECTION_TITLE(MENU_TITLE) + PC_OPTIONS_SECTION_TITLE(MENU_TITLE) - PC_OPTIONS_KEYBINDING(0, "@MENU_TEXT_CHAT", "chatmodepublic") - PC_OPTIONS_KEYBINDING(1, "@MENU_TEXT_TEAM_CHAT", "chatmodeteam") - PC_OPTIONS_KEYBINDING(2, "@MENU_QUICK_CHAT", "mp_QuickMessage") + PC_OPTIONS_KEYBINDING(0, "@MENU_TEXT_CHAT", "chatmodepublic") + PC_OPTIONS_KEYBINDING(1, "@MENU_TEXT_TEAM_CHAT", "chatmodeteam") + PC_OPTIONS_KEYBINDING(2, "@MENU_QUICK_CHAT", "mp_QuickMessage") - PC_OPTIONS_KEYBINDING(4, "@MENU_VOTE_YES", "vote yes") - PC_OPTIONS_KEYBINDING(5, "@MENU_VOTE_NO", "vote no") + PC_OPTIONS_KEYBINDING(4, "@MENU_VOTE_YES", "vote yes") + PC_OPTIONS_KEYBINDING(5, "@MENU_VOTE_NO", "vote no") - PC_OPTIONS_KEYBINDSTATUS + PC_OPTIONS_KEYBINDSTATUS - ITEM_BUTTON_BACK(ON_MENU_ESC) + ITEM_BUTTON_BACK(ON_MENU_ESC) + } } diff --git a/iw4x/iw4x_00/ui_mp/createserver.menu b/iw4x/iw4x_00/ui_mp/createserver.menu index 9171b34..5a636a0 100644 --- a/iw4x/iw4x_00/ui_mp/createserver.menu +++ b/iw4x/iw4x_00/ui_mp/createserver.menu @@ -274,49 +274,51 @@ open "settings_quick_gtnw"; \ } -menuDef { - name MENU_NAME - fullscreen 1 - rect 0 0 640 480 - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - soundLoop MENU_MUSIC - fadeCycle 1 - fadeClamp 1 - fadeAmount 0.1 + menuDef + { + name MENU_NAME + fullscreen 1 + rect 0 0 640 480 + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + soundLoop MENU_MUSIC + fadeCycle 1 + fadeClamp 1 + fadeAmount 0.1 - MENU_ON_OPEN(ON_MENU_OPEN) - MENU_ON_CLOSE(ON_MENU_CLOSE) - MENU_ON_ESC(ON_MENU_ESC) + MENU_ON_OPEN(ON_MENU_OPEN) + MENU_ON_CLOSE(ON_MENU_CLOSE) + MENU_ON_ESC(ON_MENU_ESC) - #define BACKGROUND_IW4 - #include "ui_mp/bg.inc" + #define BACKGROUND_IW4 + #include "ui_mp/bg.inc" - ITEM_NEWSTICKER_VIS("", 1, NEWSTICKER_SPEED) + ITEM_NEWSTICKER_VIS("", 1, NEWSTICKER_SPEED) - MENU_PANEL_SETTINGS + MENU_PANEL_SETTINGS - MENU_CHOICE_TITLE(MENU_TITLE, 18) + MENU_CHOICE_TITLE(MENU_TITLE, 18) - MENU_CHOICE_BUTTON(0, button_0, "@MENU_START_GAME_CAPS", ACTION_START, "@NULL_EMPTY") + MENU_CHOICE_BUTTON(0, button_0, "@MENU_START_GAME_CAPS", ACTION_START, "@NULL_EMPTY") - MENU_CHOICE_HORIZONTAL_LINE(1) + MENU_CHOICE_HORIZONTAL_LINE(1) - MENU_CHOICE_BUTTON_VIS(1, button_1, "@MENU_LOADING_MAPS", "", "@NULL_EMPTY", when(dvarint("g_loadingInitialZones") != 0)) - MENU_CHOICE_BUTTON_VIS(1, button_1, "@MENU_CHANGE_MAP_CAPS", open "settings_map", "@NULL_EMPTY", when(dvarint("g_loadingInitialZones") == 0)) - MENU_CHOICE_BUTTON(2, button_2, "@MENU_CHANGE_GAME_MODE_CAPS", open "settings_gametype", "@NULL_EMPTY") - MENU_CHOICE_BUTTON_VIS(3, button_3, "@MENU_CHANGE_GAME_RULES_CAPS", ACTION_RULES, "@NULL_EMPTY", when(dvarString(ui_gametype) != "arena" && dvarString(ui_gametype) != "oneflag")) - MENU_CHOICE_DBUTTON_VIS(3, button_3, "@MENU_CHANGE_GAME_RULES_CAPS", "@NULL_EMPTY", when(dvarString(ui_gametype) == "arena" || dvarString(ui_gametype) == "oneflag")) + MENU_CHOICE_BUTTON_VIS(1, button_1, "@MENU_LOADING_MAPS", "", "@NULL_EMPTY", when(dvarint("g_loadingInitialZones") != 0)) + MENU_CHOICE_BUTTON_VIS(1, button_1, "@MENU_CHANGE_MAP_CAPS", open "settings_map", "@NULL_EMPTY", when(dvarint("g_loadingInitialZones") == 0)) + MENU_CHOICE_BUTTON(2, button_2, "@MENU_CHANGE_GAME_MODE_CAPS", open "settings_gametype", "@NULL_EMPTY") + MENU_CHOICE_BUTTON_VIS(3, button_3, "@MENU_CHANGE_GAME_RULES_CAPS", ACTION_RULES, "@NULL_EMPTY", when(dvarString(ui_gametype) != "arena" && dvarString(ui_gametype) != "oneflag")) + MENU_CHOICE_DBUTTON_VIS(3, button_3, "@MENU_CHANGE_GAME_RULES_CAPS", "@NULL_EMPTY", when(dvarString(ui_gametype) == "arena" || dvarString(ui_gametype) == "oneflag")) - MENU_CHOICE_HORIZONTAL_LINE(4) - MENU_CHOICE_BUTTON(4, button_4, "@MENU_PASSWORD_CAPS", open "popup_serverpassword", "@NULL_EMPTY") + MENU_CHOICE_HORIZONTAL_LINE(4) + MENU_CHOICE_BUTTON(4, button_4, "@MENU_PASSWORD_CAPS", open "popup_serverpassword", "@NULL_EMPTY") - MENU_CHOICE_HORIZONTAL_LINE(5) - MENU_CHOICE_BUTTON(5, button_5, "@PLATFORM_BACK_CAPS", close self;, "@NULL_EMPTY") + MENU_CHOICE_HORIZONTAL_LINE(5) + MENU_CHOICE_BUTTON(5, button_5, "@PLATFORM_BACK_CAPS", close self;, "@NULL_EMPTY") - MENU_ITEM_NAT_TYPE - MENU_PANEL_MAP_PREVIEW + MENU_ITEM_NAT_TYPE + MENU_PANEL_MAP_PREVIEW - ITEM_BUTTON_FRIENDS(-120) -} + ITEM_BUTTON_FRIENDS(-120) + } +} \ No newline at end of file diff --git a/iw4x/iw4x_00/ui_mp/dpad_hd.menu b/iw4x/iw4x_00/ui_mp/dpad_hd.menu index a01743e..a7f34ac 100644 --- a/iw4x/iw4x_00/ui_mp/dpad_hd.menu +++ b/iw4x/iw4x_00/ui_mp/dpad_hd.menu @@ -42,7 +42,6 @@ textScale 0.3333 textStyle 3 textFont 10 - feeder 0 visible when ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) } itemDef @@ -67,7 +66,6 @@ textScale 0.25 textStyle 6 textFont 6 - feeder 0 visible 1 exp text ( "^3" + keybinding( "+actionslot 1" ) ) visible when ( ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) && actionslotusable( 1 ) ) @@ -93,7 +91,6 @@ textScale 0.3333 textStyle 3 textFont 10 - feeder 0 visible when ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) } itemDef @@ -118,7 +115,6 @@ textScale 0.25 textStyle 6 textFont 6 - feeder 0 visible 1 exp text ( "^3" + keybinding( "+actionslot 3" ) ) visible when ( ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) && actionslotusable( 3 ) ) @@ -144,7 +140,6 @@ textScale 0.3333 textStyle 3 textFont 10 - feeder 0 visible when ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) } itemDef @@ -169,7 +164,6 @@ textScale 0.25 textStyle 6 textFont 6 - feeder 0 visible 1 exp text ( "^3" + keybinding( "+actionslot 4" ) ) visible when ( ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) && actionslotusable( 4 ) ) diff --git a/iw4x/iw4x_00/ui_mp/iw4x_credits.menu b/iw4x/iw4x_00/ui_mp/iw4x_credits.menu index 96799ff..42b99c5 100644 --- a/iw4x/iw4x_00/ui_mp/iw4x_credits.menu +++ b/iw4x/iw4x_00/ui_mp/iw4x_credits.menu @@ -92,26 +92,28 @@ #define MESSAGE_CREDITS "@IW4X_CREDITS" -menuDef { - name MENU_NAME - fullscreen 1 - rect 0 0 640 480 - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - soundLoop MENU_MUSIC - fadeCycle 1 - fadeClamp 1 - fadeAmount 0.1 + menuDef + { + name MENU_NAME + fullscreen 1 + rect 0 0 640 480 + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + soundLoop MENU_MUSIC + fadeCycle 1 + fadeClamp 1 + fadeAmount 0.1 - MENU_ON_ESC(ON_MENU_ESC) + MENU_ON_ESC(ON_MENU_ESC) - #define DISABLE_SIDEBAR - #include "ui_mp/bg.inc" + #define DISABLE_SIDEBAR + #include "ui_mp/bg.inc" - LOGO_GAME + LOGO_GAME - MENU_ITEM_CREDITS_BOX("IW4x", MESSAGE_CREDITS) + MENU_ITEM_CREDITS_BOX("IW4x", MESSAGE_CREDITS) - ITEM_BUTTON_BACK(close self;) -} \ No newline at end of file + ITEM_BUTTON_BACK(close self;) + } +} diff --git a/iw4x/iw4x_00/ui_mp/main_text.menu b/iw4x/iw4x_00/ui_mp/main_text.menu index 72b31cc..79fa352 100644 --- a/iw4x/iw4x_00/ui_mp/main_text.menu +++ b/iw4x/iw4x_00/ui_mp/main_text.menu @@ -96,13 +96,11 @@ MENU_CHOICE_BUTTON_VIS(7, button_7, "@MENU_MODS_CAPS", open mods_menu;, "@MPUI_DESC_MODS", 1) MENU_CHOICE_BUTTON_VIS(8, button_8, "@MENU_OPTIONS_CAPS", open pc_options_video;, "@MPUI_DESC_OPTIONS", 1) MENU_CHOICE_HORIZONTAL_LINE_VIS(9, 1) - MENU_CHOICE_BUTTON_VIS(9, button_9, "@MENU_STORE_CAPS", uiScript "downloadDLC" 1, "@MPUI_DESC_STORE", 1) - MENU_CHOICE_NEWICON_VIS(9, when(!dvarBool(isDlcInstalled_All))) - MENU_CHOICE_BUTTON_VIS(10, button_10, "@MENU_SP_CREDITS_CAPS", open iw4x_credits;, "@NULL_EMPTY", 1) - MENU_CHOICE_BUTTON_VIS(11, button_11, "@MENU_VISIT_WEBSITE_CAPS", uiScript "visitWebsite", "@NULL_EMPTY", 1) - MENU_CHOICE_HORIZONTAL_LINE_VIS(12, 1) - MENU_CHOICE_BUTTON_VIS(12, button_12, "@MENU_MAIN_MENU_CAPS", open single_popmenu;, "@MENU_SP_DESC_SINGLEPLAYER", 1) - MENU_CHOICE_BUTTON_VIS(13, button_13, "@MENU_QUIT_CAPS", open quit_popmenu;, "@MPUI_DESC_QUIT", 1) + MENU_CHOICE_BUTTON_VIS(9, button_9, "@MENU_SP_CREDITS_CAPS", open iw4x_credits;, "@NULL_EMPTY", 1) + MENU_CHOICE_BUTTON_VIS(10, button_10, "@MENU_VISIT_WEBSITE_CAPS", uiScript "visitWebsite", "@NULL_EMPTY", 1) + MENU_CHOICE_HORIZONTAL_LINE_VIS(11, 1) + MENU_CHOICE_BUTTON_VIS(11, button_11, "@MENU_MAIN_MENU_CAPS", open single_popmenu;, "@MENU_SP_DESC_SINGLEPLAYER", 1) + MENU_CHOICE_BUTTON_VIS(12, button_12, "@MENU_QUIT_CAPS", open quit_popmenu;, "@MPUI_DESC_QUIT", 1) ITEM_BUTTON_FRIENDS(-250) diff --git a/iw4x/iw4x_00/ui_mp/menu_online_barracks.menu b/iw4x/iw4x_00/ui_mp/menu_online_barracks.menu index 48d409c..b1a6b0f 100644 --- a/iw4x/iw4x_00/ui_mp/menu_online_barracks.menu +++ b/iw4x/iw4x_00/ui_mp/menu_online_barracks.menu @@ -73,160 +73,162 @@ exp text (localvarstring("ui_hint_text")) \ } -menuDef { - name MENU_NAME - fullscreen 1 - rect 0 0 640 480 - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - soundLoop MENU_MUSIC - fadeCycle 1 - fadeClamp 1 - fadeAmount 0.1 - - MENU_ON_OPEN(ON_MENU_OPEN) - MENU_ON_ESC(ON_MENU_ESC) - - #define BACKGROUND_IW4 - #include "ui_mp/bg.inc" - - ITEM_NEWSTICKER_VIS("", 1, NEWSTICKER_SPEED) - - MENU_CHOICE_TITLE(MENU_TITLE, PLAYERCARD_POS_Y) - - MENU_PARTY_STATUS_STRING - - HINT_AREA - - itemDef + menuDef { - BUTTON_BASE(0, "button_0", "@MPUI_CHALLENGES_CAPS", !isItemUnlocked("challenges")) - BUTTON_ACTION(setPlayerData("featureNew", "challenges", "false"); open "menu_challenges";) - onFocus + name MENU_NAME + fullscreen 1 + rect 0 0 640 480 + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + soundLoop MENU_MUSIC + fadeCycle 1 + fadeClamp 1 + fadeAmount 0.1 + + MENU_ON_OPEN(ON_MENU_OPEN) + MENU_ON_ESC(ON_MENU_ESC) + + #define BACKGROUND_IW4 + #include "ui_mp/bg.inc" + + ITEM_NEWSTICKER_VIS("", 1, NEWSTICKER_SPEED) + + MENU_CHOICE_TITLE(MENU_TITLE, PLAYERCARD_POS_Y) + + MENU_PARTY_STATUS_STRING + + HINT_AREA + + itemDef { - play CHOICE_FOCUS_SOUND; - setItemColor self backColor 0 0 0 1; - if (isItemUnlocked("challenges")) + BUTTON_BASE(0, "button_0", "@MPUI_CHALLENGES_CAPS", !isItemUnlocked("challenges")) + BUTTON_ACTION(setPlayerData("featureNew", "challenges", "false"); open "menu_challenges";) + onFocus { - setLocalVarString "ui_hint_text" ("@MPUI_DESC_CHALLENGES"); - } - else - { - if (tablelookup("mp/unlockTable.csv", 0, "challenges", 2) == 9999) + play CHOICE_FOCUS_SOUND; + setItemColor self backColor 0 0 0 1; + if (isItemUnlocked("challenges")) { - setLocalVarString "ui_hint_text" ("@PERKS_UNLOCKED_AT_NONE"); + setLocalVarString "ui_hint_text" ("@MPUI_DESC_CHALLENGES"); } else { - if (tablelookup("mp/unlockTable.csv", 0, "challenges", 3) != "") + if (tablelookup("mp/unlockTable.csv", 0, "challenges", 2) == 9999) { - setLocalVarString "ui_hint_text" ("@PERKS_UNLOCKED_BY_CHALLENGE"); + setLocalVarString "ui_hint_text" ("@PERKS_UNLOCKED_AT_NONE"); } else { - setLocalVarString "ui_hint_text" ("@" + tablelookup("mp/rankTable.csv", 0, tablelookup("mp/unlockTable.csv", 0, "challenges", 2) , 17)); + if (tablelookup("mp/unlockTable.csv", 0, "challenges", 3) != "") + { + setLocalVarString "ui_hint_text" ("@PERKS_UNLOCKED_BY_CHALLENGE"); + } + else + { + setLocalVarString "ui_hint_text" ("@" + tablelookup("mp/rankTable.csv", 0, tablelookup("mp/unlockTable.csv", 0, "challenges", 2) , 17)); + } } + exec "set ui_hint_text THIS MENU SHOULD BE UPDATED TO USE setLocalVarString ui_hint_text;"; } - exec "set ui_hint_text THIS MENU SHOULD BE UPDATED TO USE setLocalVarString ui_hint_text;"; } } - } - MENU_CHOICE_NEWICON_VIS(0, when((getplayerdata("prestige") < int(tablelookup("mp/rankIconTable.csv", 0, "maxprestige", 1)) && getplayerdata("experience") >= int(tablelookup("mp/rankTable.csv", 0, int(tablelookup("mp/rankTable.csv", 0, "maxrank", 1)), 7))) && getplayerdata("featureNew" ,"prestige"))) + MENU_CHOICE_NEWICON_VIS(0, when((getplayerdata("prestige") < int(tablelookup("mp/rankIconTable.csv", 0, "maxprestige", 1)) && getplayerdata("experience") >= int(tablelookup("mp/rankTable.csv", 0, int(tablelookup("mp/rankTable.csv", 0, "maxrank", 1)), 7))) && getplayerdata("featureNew" ,"prestige"))) - itemDef - { - BUTTON_BASE(1, "button_1", "@MPUI_HIGHLIGHTS_CAPS", 0) - BUTTON_ACTION(open "menu_records";) - onFocus + itemDef { - play CHOICE_FOCUS_SOUND; - setItemColor self backColor 0 0 0 1; - setLocalVarString "ui_hint_text" ("@MPUI_DESC_HIGHLIGHTS"); - } - } - - MENU_CHOICE_HORIZONTAL_LINE(2) - - itemDef - { - BUTTON_BASE(2, "button_2", "@MENU_CUSTOM_TITLE_CAPS", 0) - BUTTON_ACTION(open "popup_customtitle";) - onFocus - { - play CHOICE_FOCUS_SOUND; - setItemColor self backColor 0 0 0 1; - setLocalVarString "ui_hint_text" ("@MPUI_DESC_CUSTOM_TITLE"); - } - } - - itemDef - { - BUTTON_BASE(3, "button_3", "@MPUI_CLAN_TAG_CAPS", 0) - BUTTON_ACTION(open "popup_customclan";) - onFocus - { - play CHOICE_FOCUS_SOUND; - setItemColor self backColor 0 0 0 1; - setLocalVarString "ui_hint_text" ("@MPUI_DESC_CLANTAG"); - } - } - - MENU_CHOICE_HORIZONTAL_LINE(4) - - itemDef - { - BUTTON_BASE(4, "button_4", "@MPUI_RESET_STATS_CAPS", 0) - BUTTON_ACTION(open "stats_reset";) - onFocus - { - play CHOICE_FOCUS_SOUND; - setItemColor self backColor 0 0 0 1; - setLocalVarString "ui_hint_text" ("@MPUI_DESC_RESET_STATS"); - } - } - - itemDef - { - BUTTON_BASE(5, "button_5", "@MPUI_UNLOCK_STATS_CAPS", 0) - BUTTON_ACTION(open "stats_unlock";) - onFocus - { - play CHOICE_FOCUS_SOUND; - setItemColor self backColor 0 0 0 1; - setLocalVarString "ui_hint_text" ("@MPUI_DESC_UNLOCK_STATS"); - } - } - - MENU_CHOICE_HORIZONTAL_LINE_VIS(5, when ((getplayerdata("prestige") == int(tablelookup("mp/rankIconTable.csv", 0, "maxprestige", 1))) == 0)) - - itemDef - { - BUTTON_BASE(6, "button_6", "@MPUI_PRESTIGE_MODE_CAPS", !(getplayerdata("prestige") < int(tablelookup("mp/rankIconTable.csv", 0, "maxprestige", 1)) && getplayerdata("experience") >= int(tablelookup("mp/rankTable.csv", 0, int(tablelookup("mp/rankTable.csv", 0, "maxrank", 1)), 7))) && !(getplayerdata("prestige") == int(tablelookup("mp/rankIconTable.csv", 0, "maxprestige", 1)))) - visible when (!(getplayerdata("prestige") == int(tablelookup("mp/rankIconTable.csv", 0, "maxprestige", 1)))) - BUTTON_ACTION(open "prestige_reset1";) - onFocus - { - play CHOICE_FOCUS_SOUND; - setItemColor self backColor 0 0 0 1; - setPlayerData("featureNew", "prestige", "false"); - if (!(getplayerdata("prestige") < int(tablelookup("mp/rankIconTable.csv", 0, "maxprestige", 1)) && getplayerdata("experience") >= int(tablelookup("mp/rankTable.csv", 0, int(tablelookup("mp/rankTable.csv", 0, "maxrank", 1)) , 7)))) + BUTTON_BASE(1, "button_1", "@MPUI_HIGHLIGHTS_CAPS", 0) + BUTTON_ACTION(open "menu_records";) + onFocus { - setLocalVarString "ui_hint_text" ( "@MPUI_DESC_PRESTIGE2" ); - } - else - { - setLocalVarString "ui_hint_text" ( "@MPUI_DESC_PRESTIGE" ); + play CHOICE_FOCUS_SOUND; + setItemColor self backColor 0 0 0 1; + setLocalVarString "ui_hint_text" ("@MPUI_DESC_HIGHLIGHTS"); } } + + MENU_CHOICE_HORIZONTAL_LINE(2) + + itemDef + { + BUTTON_BASE(2, "button_2", "@MENU_CUSTOM_TITLE_CAPS", 0) + BUTTON_ACTION(open "popup_customtitle";) + onFocus + { + play CHOICE_FOCUS_SOUND; + setItemColor self backColor 0 0 0 1; + setLocalVarString "ui_hint_text" ("@MPUI_DESC_CUSTOM_TITLE"); + } + } + + itemDef + { + BUTTON_BASE(3, "button_3", "@MPUI_CLAN_TAG_CAPS", 0) + BUTTON_ACTION(open "popup_customclan";) + onFocus + { + play CHOICE_FOCUS_SOUND; + setItemColor self backColor 0 0 0 1; + setLocalVarString "ui_hint_text" ("@MPUI_DESC_CLANTAG"); + } + } + + MENU_CHOICE_HORIZONTAL_LINE(4) + + itemDef + { + BUTTON_BASE(4, "button_4", "@MPUI_RESET_STATS_CAPS", 0) + BUTTON_ACTION(open "stats_reset";) + onFocus + { + play CHOICE_FOCUS_SOUND; + setItemColor self backColor 0 0 0 1; + setLocalVarString "ui_hint_text" ("@MPUI_DESC_RESET_STATS"); + } + } + + itemDef + { + BUTTON_BASE(5, "button_5", "@MPUI_UNLOCK_STATS_CAPS", 0) + BUTTON_ACTION(open "stats_unlock";) + onFocus + { + play CHOICE_FOCUS_SOUND; + setItemColor self backColor 0 0 0 1; + setLocalVarString "ui_hint_text" ("@MPUI_DESC_UNLOCK_STATS"); + } + } + + MENU_CHOICE_HORIZONTAL_LINE_VIS(5, when ((getplayerdata("prestige") == int(tablelookup("mp/rankIconTable.csv", 0, "maxprestige", 1))) == 0)) + + itemDef + { + BUTTON_BASE(6, "button_6", "@MPUI_PRESTIGE_MODE_CAPS", !(getplayerdata("prestige") < int(tablelookup("mp/rankIconTable.csv", 0, "maxprestige", 1)) && getplayerdata("experience") >= int(tablelookup("mp/rankTable.csv", 0, int(tablelookup("mp/rankTable.csv", 0, "maxrank", 1)), 7))) && !(getplayerdata("prestige") == int(tablelookup("mp/rankIconTable.csv", 0, "maxprestige", 1)))) + visible when (!(getplayerdata("prestige") == int(tablelookup("mp/rankIconTable.csv", 0, "maxprestige", 1)))) + BUTTON_ACTION(open "prestige_reset1";) + onFocus + { + play CHOICE_FOCUS_SOUND; + setItemColor self backColor 0 0 0 1; + setPlayerData("featureNew", "prestige", "false"); + if (!(getplayerdata("prestige") < int(tablelookup("mp/rankIconTable.csv", 0, "maxprestige", 1)) && getplayerdata("experience") >= int(tablelookup("mp/rankTable.csv", 0, int(tablelookup("mp/rankTable.csv", 0, "maxrank", 1)) , 7)))) + { + setLocalVarString "ui_hint_text" ( "@MPUI_DESC_PRESTIGE2" ); + } + else + { + setLocalVarString "ui_hint_text" ( "@MPUI_DESC_PRESTIGE" ); + } + } + } + + MENU_CHOICE_NEWICON_VIS(5, when((getplayerdata("prestige") < int(tablelookup("mp/rankIconTable.csv", 0, "maxprestige", 1)) && getplayerdata("experience") >= int(tablelookup("mp/rankTable.csv", 0, int(tablelookup("mp/rankTable.csv", 0, "maxrank", 1)), 7))) && getplayerdata("featureNew", "prestige"))) + + MENU_ITEM_PLAYERCARD + MENU_ITEM_PLAYERSTATS + + ITEM_BUTTON_FRIENDS(-120) + ITEM_BUTTON_BACK(close self;) } - - MENU_CHOICE_NEWICON_VIS(5, when((getplayerdata("prestige") < int(tablelookup("mp/rankIconTable.csv", 0, "maxprestige", 1)) && getplayerdata("experience") >= int(tablelookup("mp/rankTable.csv", 0, int(tablelookup("mp/rankTable.csv", 0, "maxrank", 1)), 7))) && getplayerdata("featureNew", "prestige"))) - - MENU_ITEM_PLAYERCARD - MENU_ITEM_PLAYERSTATS - - ITEM_BUTTON_FRIENDS(-120) - ITEM_BUTTON_BACK(close self;) -} +} \ No newline at end of file diff --git a/iw4x/iw4x_00/ui_mp/menu_xboxlive_lobby.menu b/iw4x/iw4x_00/ui_mp/menu_xboxlive_lobby.menu index a8aba67..6bcd03f 100644 --- a/iw4x/iw4x_00/ui_mp/menu_xboxlive_lobby.menu +++ b/iw4x/iw4x_00/ui_mp/menu_xboxlive_lobby.menu @@ -156,108 +156,110 @@ open "popup_summary"; \ play CHOICE_CLICK_SOUND; -menuDef { - name MENU_NAME - fullscreen 1 - rect 0 0 640 480 - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - soundLoop MENU_MUSIC - fadeCycle 1 - fadeClamp 1 - fadeAmount 0.1 - - MENU_ON_OPEN(ON_MENU_OPEN) - MENU_ON_ESC(ON_MENU_ESC) - - MENU_EXEC_KEYINT(K_APAD_LEFT, ON_MENU_KEY_K_APAD_LEFT) - MENU_EXEC_KEYINT(K_APAD_RIGHT, ON_MENU_KEY_K_APAD_RIGHT) - MENU_EXEC_KEYINT(K_DPAD_LEFT, ON_MENU_KEY_K_DPAD_LEFT) - MENU_EXEC_KEYINT(K_DPAD_RIGHT, ON_MENU_KEY_K_DPAD_RIGHT) - MENU_EXEC_KEYINT(K_F1, ON_MENU_KEY_K_F1) - - #define BACKGROUND_IW4 - #include "ui_mp/bg.inc" - #include "ui_mp/lobby.inc" - - ITEM_NEWSTICKER_VIS("", 1, NEWSTICKER_SPEED) - - MENU_CHOICE_TITLE_RAW(MENU_TITLE, 0, 0.4, 1) - - MENU_CHOICE_HORIZONTAL_LINE(1) - - MENU_CHOICE_DBUTTON_VIS(1, button_1, "@MENU_CREATE_A_CLASS_CAPS", "@PERKS_UNLOCKED_BY_CHALLENGE", when(!isItemUnlocked("cac"))) - MENU_CHOICE_BUTTON_VIS(1, button_1, "@MENU_CREATE_A_CLASS_CAPS", open "cac_popup";, "@MPUI_DESC_CREATE_A_CLASS", when(isItemUnlocked("cac"))) - MENU_CHOICE_NEWICON_VIS(1, when( ( isItemUnlocked("cac") && ( getPlayerDataAnyBoolTrue( "weaponNew" ) || getPlayerDataAnyBoolTrue( "camoNew" ) || getPlayerDataAnyBoolTrue( "attachmentNew" ) ) || getPlayerDataAnyBoolTrue( "perkNew" ) || ( ( getPlayerData( "perkNew" , "frag_grenade_mp" ) || getPlayerData( "perkNew" , tablelookup( "mp/perkTable.csv" , 1 , "frag_grenade_mp" , 8 ) ) ) || ( getPlayerData( "perkNew" , "semtex_mp" ) || getPlayerData( "perkNew" , tablelookup( "mp/perkTable.csv" , 1 , "semtex_mp" , 8 ) ) ) || ( getPlayerData( "perkNew" , "c4_mp" ) || getPlayerData( "perkNew" , tablelookup( "mp/perkTable.csv" , 1 , "c4_mp" , 8 ) ) ) || ( getPlayerData( "perkNew" , "claymore_mp" ) || getPlayerData( "perkNew" , tablelookup( "mp/perkTable.csv" , 1 , "claymore_mp" , 8 ) ) ) || ( getPlayerData( "perkNew" , "throwingknife_mp" ) || getPlayerData( "perkNew" , tablelookup( "mp/perkTable.csv" , 1 , "throwingknife_mp" , 8 ) ) ) || ( getPlayerData( "perkNew" , "specialty_tacticalinsertion" ) || getPlayerData( "perkNew" , tablelookup( "mp/perkTable.csv" , 1 , "specialty_tacticalinsertion" , 8 ) ) ) || ( getPlayerData( "perkNew" , "specialty_blastshield" ) || getPlayerData( "perkNew" , tablelookup( "mp/perkTable.csv" , 1 , "specialty_blastshield" , 8 ) ) ) || weaponClassNew( "weapon_grenade" ) || weaponClassNew( "weapon_equipment" ) ) || getPlayerData( "featureNew" , "cac" ) ) ) ) - MENU_CHOICE_DBUTTON_VIS(2, button_2, "@MENU_PLAYERCARD_CAPS", "@PERKS_UNLOCKED_BY_CHALLENGE", when(!isItemUnlocked("cac"))) - MENU_CHOICE_BUTTON_VIS(2, button_2, "@MENU_PLAYERCARD_CAPS", open "popup_callsign";, "@MPUI_DESC_PLAYERCARD", when(isItemUnlocked("cac"))) - MENU_CHOICE_NEWICON_VIS(2, when( ( getPlayerData( "featureNew" , "cas" ) || getPlayerData( "featureNew" , "token_1" ) || getPlayerData( "featureNew" , "token_2" ) || getPlayerData( "featureNew" , "token_3" ) || getPlayerData( "featureNew" , "token_4" ) || getPlayerData( "featureNew" , "token_5" ) || getPlayerData( "featureNew" , "token_6" ) || getPlayerData( "featureNew" , "token_7" ) || getPlayerData( "featureNew" , "token_8" ) || getPlayerData( "featureNew" , "token_9" ) || getPlayerData( "featureNew" , "token_10" ) || getPlayerData( "featureNew" , "token_11" ) || getPlayerData( "featureNew" , "token_12" ) ) || getPlayerData( "featureNew" , "clantag" ) || ( getPlayerDataAnyBoolTrue( "iconNew" ) || getPlayerData( "featureNew" , "playercard_icon" ) ) || ( getPlayerDataAnyBoolTrue( "titleNew" ) || getPlayerData( "featureNew" , "playercard_title" ) ) )) - MENU_CHOICE_BUTTON_VIS(3, button_3, "@MENU_BARRACKS_CAPS", open "menu_online_barracks";, "@PATCH_DESC_BARRACKS", 1) - MENU_CHOICE_NEWICON_VIS(3, when( ( ( getPlayerDataAnyBoolTrue( "challengeTierNew" ) || getPlayerData( "featureNew" , "challenges" ) ) || getPlayerData( "featureNew" , "challenges" ) || getPlayerData( "featureNew" , "prestige" ) ) ) ) - MENU_CHOICE_BUTTON_VIS(4, button_4, "@MENU_FRIENDS_CAPS", open "popup_friends";, "@MPUI_DESC_FRIENDS", 1) - - MENU_CHOICE_HORIZONTAL_LINE(4) - - itemDef + menuDef { - name "button_5" - rect CHOICE_RECT(5) - foreColor CHOICE_TEXTCOLOR - disableColor 0.6 0.55 0.55 1 - style WINDOW_STYLE_FILLED - background HIGHLIGHT_SHADER_ART - group "mw2_button" - type ITEM_TYPE_BUTTON - textAlign ITEM_ALIGN_TOP_RIGHT - textAlignX -60 - textScale CHOICE_TEXTSIZE - textFont CHOICE_TEXTFONT - text "@MENU_VOTE_TO_SKIP_CAPS" - disabled when(!dvarbool("party_vetoButtonVisible")) - visible 1 - execKeyInt 29 + name MENU_NAME + fullscreen 1 + rect 0 0 640 480 + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + soundLoop MENU_MUSIC + fadeCycle 1 + fadeClamp 1 + fadeAmount 0.1 + + MENU_ON_OPEN(ON_MENU_OPEN) + MENU_ON_ESC(ON_MENU_ESC) + + MENU_EXEC_KEYINT(K_APAD_LEFT, ON_MENU_KEY_K_APAD_LEFT) + MENU_EXEC_KEYINT(K_APAD_RIGHT, ON_MENU_KEY_K_APAD_RIGHT) + MENU_EXEC_KEYINT(K_DPAD_LEFT, ON_MENU_KEY_K_DPAD_LEFT) + MENU_EXEC_KEYINT(K_DPAD_RIGHT, ON_MENU_KEY_K_DPAD_RIGHT) + MENU_EXEC_KEYINT(K_F1, ON_MENU_KEY_K_F1) + + #define BACKGROUND_IW4 + #include "ui_mp/bg.inc" + #include "ui_mp/lobby.inc" + + ITEM_NEWSTICKER_VIS("", 1, NEWSTICKER_SPEED) + + MENU_CHOICE_TITLE_RAW(MENU_TITLE, 0, 0.4, 1) + + MENU_CHOICE_HORIZONTAL_LINE(1) + + MENU_CHOICE_DBUTTON_VIS(1, button_1, "@MENU_CREATE_A_CLASS_CAPS", "@PERKS_UNLOCKED_BY_CHALLENGE", when(!isItemUnlocked("cac"))) + MENU_CHOICE_BUTTON_VIS(1, button_1, "@MENU_CREATE_A_CLASS_CAPS", open "cac_popup";, "@MPUI_DESC_CREATE_A_CLASS", when(isItemUnlocked("cac"))) + MENU_CHOICE_NEWICON_VIS(1, when( ( isItemUnlocked("cac") && ( getPlayerDataAnyBoolTrue( "weaponNew" ) || getPlayerDataAnyBoolTrue( "camoNew" ) || getPlayerDataAnyBoolTrue( "attachmentNew" ) ) || getPlayerDataAnyBoolTrue( "perkNew" ) || ( ( getPlayerData( "perkNew" , "frag_grenade_mp" ) || getPlayerData( "perkNew" , tablelookup( "mp/perkTable.csv" , 1 , "frag_grenade_mp" , 8 ) ) ) || ( getPlayerData( "perkNew" , "semtex_mp" ) || getPlayerData( "perkNew" , tablelookup( "mp/perkTable.csv" , 1 , "semtex_mp" , 8 ) ) ) || ( getPlayerData( "perkNew" , "c4_mp" ) || getPlayerData( "perkNew" , tablelookup( "mp/perkTable.csv" , 1 , "c4_mp" , 8 ) ) ) || ( getPlayerData( "perkNew" , "claymore_mp" ) || getPlayerData( "perkNew" , tablelookup( "mp/perkTable.csv" , 1 , "claymore_mp" , 8 ) ) ) || ( getPlayerData( "perkNew" , "throwingknife_mp" ) || getPlayerData( "perkNew" , tablelookup( "mp/perkTable.csv" , 1 , "throwingknife_mp" , 8 ) ) ) || ( getPlayerData( "perkNew" , "specialty_tacticalinsertion" ) || getPlayerData( "perkNew" , tablelookup( "mp/perkTable.csv" , 1 , "specialty_tacticalinsertion" , 8 ) ) ) || ( getPlayerData( "perkNew" , "specialty_blastshield" ) || getPlayerData( "perkNew" , tablelookup( "mp/perkTable.csv" , 1 , "specialty_blastshield" , 8 ) ) ) || weaponClassNew( "weapon_grenade" ) || weaponClassNew( "weapon_equipment" ) ) || getPlayerData( "featureNew" , "cac" ) ) ) ) + MENU_CHOICE_DBUTTON_VIS(2, button_2, "@MENU_PLAYERCARD_CAPS", "@PERKS_UNLOCKED_BY_CHALLENGE", when(!isItemUnlocked("cac"))) + MENU_CHOICE_BUTTON_VIS(2, button_2, "@MENU_PLAYERCARD_CAPS", open "popup_callsign";, "@MPUI_DESC_PLAYERCARD", when(isItemUnlocked("cac"))) + MENU_CHOICE_NEWICON_VIS(2, when( ( getPlayerData( "featureNew" , "cas" ) || getPlayerData( "featureNew" , "token_1" ) || getPlayerData( "featureNew" , "token_2" ) || getPlayerData( "featureNew" , "token_3" ) || getPlayerData( "featureNew" , "token_4" ) || getPlayerData( "featureNew" , "token_5" ) || getPlayerData( "featureNew" , "token_6" ) || getPlayerData( "featureNew" , "token_7" ) || getPlayerData( "featureNew" , "token_8" ) || getPlayerData( "featureNew" , "token_9" ) || getPlayerData( "featureNew" , "token_10" ) || getPlayerData( "featureNew" , "token_11" ) || getPlayerData( "featureNew" , "token_12" ) ) || getPlayerData( "featureNew" , "clantag" ) || ( getPlayerDataAnyBoolTrue( "iconNew" ) || getPlayerData( "featureNew" , "playercard_icon" ) ) || ( getPlayerDataAnyBoolTrue( "titleNew" ) || getPlayerData( "featureNew" , "playercard_title" ) ) )) + MENU_CHOICE_BUTTON_VIS(3, button_3, "@MENU_BARRACKS_CAPS", open "menu_online_barracks";, "@PATCH_DESC_BARRACKS", 1) + MENU_CHOICE_NEWICON_VIS(3, when( ( ( getPlayerDataAnyBoolTrue( "challengeTierNew" ) || getPlayerData( "featureNew" , "challenges" ) ) || getPlayerData( "featureNew" , "challenges" ) || getPlayerData( "featureNew" , "prestige" ) ) ) ) + MENU_CHOICE_BUTTON_VIS(4, button_4, "@MENU_FRIENDS_CAPS", open "popup_friends";, "@MPUI_DESC_FRIENDS", 1) + + MENU_CHOICE_HORIZONTAL_LINE(4) + + itemDef { - focusfirst; - } - execKeyInt 21 - { - focusfirst; - } - mouseEnter - { - play CHOICE_FOCUS_SOUND; - } - onFocus - { - setItemColor self backColor 0 0 0 1; - setLocalVarBool ui_menuAButton (1); - setLocalVarFloat ui_popupYPos (getfocuseditemy()); - if (dvarBool("party_vetoButtonVisible")) + name "button_5" + rect CHOICE_RECT(5) + foreColor CHOICE_TEXTCOLOR + disableColor 0.6 0.55 0.55 1 + style WINDOW_STYLE_FILLED + background HIGHLIGHT_SHADER_ART + group "mw2_button" + type ITEM_TYPE_BUTTON + textAlign ITEM_ALIGN_TOP_RIGHT + textAlignX -60 + textScale CHOICE_TEXTSIZE + textFont CHOICE_TEXTFONT + text "@MENU_VOTE_TO_SKIP_CAPS" + disabled when(!dvarbool("party_vetoButtonVisible")) + visible 1 + execKeyInt 29 { - setLocalVarString ui_hint_text ("@MPUI_DESC_VOTE_TO_SKIP"); + focusfirst; } - else + execKeyInt 21 { - setLocalVarString ui_hint_text ("@MPUI_VOTE_CAST"); + focusfirst; + } + mouseEnter + { + play CHOICE_FOCUS_SOUND; + } + onFocus + { + setItemColor self backColor 0 0 0 1; + setLocalVarBool ui_menuAButton (1); + setLocalVarFloat ui_popupYPos (getfocuseditemy()); + if (dvarBool("party_vetoButtonVisible")) + { + setLocalVarString ui_hint_text ("@MPUI_DESC_VOTE_TO_SKIP"); + } + else + { + setLocalVarString ui_hint_text ("@MPUI_VOTE_CAST"); + } + } + leaveFocus + { + setItemColor self backColor 0 0 0 0; + setLocalVarBool ui_menuAButton (0); + setLocalVarString ui_hint_text "@NULL_EMPTY"; + } + action + { + play CHOICE_CLICK_SOUND; + focusfirst; + open "skipmapconfirmation"; } } - leaveFocus - { - setItemColor self backColor 0 0 0 0; - setLocalVarBool ui_menuAButton (0); - setLocalVarString ui_hint_text "@NULL_EMPTY"; - } - action - { - play CHOICE_CLICK_SOUND; - focusfirst; - open "skipmapconfirmation"; - } + + MENU_PANEL_MAP_PREVIEW + + ITEM_BUTTON_SUMMARY_VIS(1) + ITEM_BUTTON_BACK(ON_MENU_ESC) } - - MENU_PANEL_MAP_PREVIEW - - ITEM_BUTTON_SUMMARY_VIS(1) - ITEM_BUTTON_BACK(ON_MENU_ESC) } diff --git a/iw4x/iw4x_00/ui_mp/menu_xboxlive_privatelobby.menu b/iw4x/iw4x_00/ui_mp/menu_xboxlive_privatelobby.menu index 838b1ea..db26553 100644 --- a/iw4x/iw4x_00/ui_mp/menu_xboxlive_privatelobby.menu +++ b/iw4x/iw4x_00/ui_mp/menu_xboxlive_privatelobby.menu @@ -8,4 +8,5 @@ { open "createserver"; } -} + } +} diff --git a/iw4x/iw4x_00/ui_mp/mods_menu.menu b/iw4x/iw4x_00/ui_mp/mods_menu.menu index a8fb23e..b367283 100644 --- a/iw4x/iw4x_00/ui_mp/mods_menu.menu +++ b/iw4x/iw4x_00/ui_mp/mods_menu.menu @@ -19,7 +19,7 @@ setLocalVarString ui_info_name ""; \ setLocalVarString ui_info_desc ""; \ setLocalVarString ui_info_icon ""; \ - uiScript "LoadMods"; + uiScript "LoadMods"; \ setFocus "modlist"; #define MENU_MODS_BUTTON_VIS(nameArg, yPos, textArg, actionArg, visArg) \ @@ -71,57 +71,59 @@ exp rect x (posX) \ } -menuDef { - name MENU_NAME - fullscreen 1 - rect 0 0 640 480 - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - soundLoop MENU_MUSIC - fadeCycle 1 - fadeClamp 1 - fadeAmount 0.1 - - MENU_ON_OPEN(ON_MENU_OPEN) - MENU_ON_ESC(close self;) - - #define DISABLE_SIDEBAR - #include "ui_mp/bg.inc" - - MENU_ITEM_TITLE(-80) - MENU_BACKGROUND_FRAME - MENU_BACKGROUND_PANEL_RIGHT - - itemDef + menuDef { - name "modlist" - rect 0 28 210 356 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP - style WINDOW_STYLE_FILLED - foreColor CHOICE_TEXTCOLOR - backColor 0 0 0 0.5 - outlineColor 0 0 0 0.6 - type ITEM_TYPE_LISTBOX - textFont CHOICE_TEXTFONT - textAlignX 6 - textScale CHOICE_TEXTSIZE - feeder FEEDER_MODS - selectBorder 0.8 0.95 1 0 - elementWidth 120 - elementHeight 22 - visible 1 -// numcols xpos xwidth textlen alignment - columns 1 8 120 25 0 - doubleClick + name MENU_NAME + fullscreen 1 + rect 0 0 640 480 + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + soundLoop MENU_MUSIC + fadeCycle 1 + fadeClamp 1 + fadeAmount 0.1 + + MENU_ON_OPEN(ON_MENU_OPEN) + MENU_ON_ESC(close self;) + + #define DISABLE_SIDEBAR + #include "ui_mp/bg.inc" + + MENU_ITEM_TITLE(-80) + MENU_BACKGROUND_FRAME + MENU_BACKGROUND_PANEL_RIGHT + + itemDef { - uiScript "RunMod"; + name "modlist" + rect 0 28 210 356 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP + style WINDOW_STYLE_FILLED + foreColor CHOICE_TEXTCOLOR + backColor 0 0 0 0.5 + outlineColor 0 0 0 0.6 + type ITEM_TYPE_LISTBOX + textFont CHOICE_TEXTFONT + textAlignX 6 + textScale CHOICE_TEXTSIZE + feeder FEEDER_MODS + selectBorder 0.8 0.95 1 0 + elementWidth 120 + elementHeight 22 + visible 1 + // numcols xpos xwidth textlen alignment + columns 1 8 120 25 0 + doubleClick + { + uiScript "RunMod"; + } + MENU_EXEC_KEYINT(13, uiScript "RunMod";) } - MENU_EXEC_KEYINT(13, uiScript "RunMod";) + + MENU_MODS_BUTTON_VIS("loadMod", -48, "@MENU_LAUNCH", uiScript "RunMod", when (dvarstring("fs_game") == "")) + MENU_MODS_BUTTON_VIS("loadMod", -68, "@MENU_LAUNCH", uiScript "RunMod", when (dvarstring("fs_game") != "")) + MENU_MODS_BUTTON_VIS("unloadMod", -48, "@MENU_LAUNCH_WITHOUT_MODS", uiScript "ClearMods", when (dvarstring("fs_game") != "")) + + ITEM_BUTTON_BACK(close self;) } - - MENU_MODS_BUTTON_VIS("loadMod", -48, "@MENU_LAUNCH", uiScript "RunMod", when (dvarstring("fs_game") == "")) - MENU_MODS_BUTTON_VIS("loadMod", -68, "@MENU_LAUNCH", uiScript "RunMod", when (dvarstring("fs_game") != "")) - MENU_MODS_BUTTON_VIS("unloadMod", -48, "@MENU_LAUNCH_WITHOUT_MODS", uiScript "ClearMods", when (dvarstring("fs_game") != "")) - - ITEM_BUTTON_BACK(close self;) } \ No newline at end of file diff --git a/iw4x/iw4x_00/ui_mp/pc_join_unranked.menu b/iw4x/iw4x_00/ui_mp/pc_join_unranked.menu index 86247b0..58e9cc7 100644 --- a/iw4x/iw4x_00/ui_mp/pc_join_unranked.menu +++ b/iw4x/iw4x_00/ui_mp/pc_join_unranked.menu @@ -30,35 +30,37 @@ #define ON_MENU_KEY_ENTER \ uiScript "JoinServer"; -menuDef { - name MENU_NAME - fullscreen 1 - rect 0 0 640 480 - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - soundLoop MENU_MUSIC - fadeCycle 1 - fadeClamp 1 - fadeAmount 0.1 + menuDef + { + name MENU_NAME + fullscreen 1 + rect 0 0 640 480 + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + soundLoop MENU_MUSIC + fadeCycle 1 + fadeClamp 1 + fadeAmount 0.1 - MENU_ON_OPEN(ON_MENU_OPEN) - MENU_ON_ESC(ON_MENU_ESC) + MENU_ON_OPEN(ON_MENU_OPEN) + MENU_ON_ESC(ON_MENU_ESC) - MENU_EXEC_KEYINT(KEYINT_F5, ON_MENU_KEY_F5) - MENU_EXEC_KEYINT(KEYINT_ENTER, ON_MENU_KEY_ENTER) + MENU_EXEC_KEYINT(KEYINT_F5, ON_MENU_KEY_F5) + MENU_EXEC_KEYINT(KEYINT_ENTER, ON_MENU_KEY_ENTER) - #define DISABLE_SIDEBAR - #include "ui_mp/bg.inc" + #define DISABLE_SIDEBAR + #include "ui_mp/bg.inc" - #include "ui_mp/joinserver.inc" + #include "ui_mp/joinserver.inc" - ITEM_MENU_TITLE_VIS(MENU_TITLE, 1) - - BUTTON_FOOTER(-310, 100, "back", "@PLATFORM_BACK_CAPS", ON_MENU_ESC) - BUTTON_FOOTER_VIS(-194, 140, "addFavorite", "@MENU_ADD_TO_FAVORITES_CAPS", uiScript "CreateListFavorite", when(dvarInt("ui_netSource") != 2)) - BUTTON_FOOTER_VIS(-194, 140, "delFavorite", "@MENU_DEL_FAVORITE_CAPS", uiScript "DeleteFavorite", when(dvarInt("ui_netSource") == 2)) - BUTTON_FOOTER(-34, 100, "passwordenter", "@MENU_PASSWORD_CAPS", open "popup_joinpassword";) - BUTTON_FOOTER(86, 100, "serverinfo", "@MENU_SERVER_INFO_CAPS", open "serverinfo_popmenu";) - BUTTON_FOOTER(206, 100, "joinserver", "@MENU_JOIN_SERVER_CAPS", uiScript "JoinServer";) + ITEM_MENU_TITLE_VIS(MENU_TITLE, 1) + + BUTTON_FOOTER(-310, 100, "back", "@PLATFORM_BACK_CAPS", ON_MENU_ESC) + BUTTON_FOOTER_VIS(-194, 140, "addFavorite", "@MENU_ADD_TO_FAVORITES_CAPS", uiScript "CreateListFavorite", when(dvarInt("ui_netSource") != 2)) + BUTTON_FOOTER_VIS(-194, 140, "delFavorite", "@MENU_DEL_FAVORITE_CAPS", uiScript "DeleteFavorite", when(dvarInt("ui_netSource") == 2)) + BUTTON_FOOTER(-34, 100, "passwordenter", "@MENU_PASSWORD_CAPS", open "popup_joinpassword";) + BUTTON_FOOTER(86, 100, "serverinfo", "@MENU_SERVER_INFO_CAPS", open "serverinfo_popmenu";) + BUTTON_FOOTER(206, 100, "joinserver", "@MENU_JOIN_SERVER_CAPS", uiScript "JoinServer";) + } } diff --git a/iw4x/iw4x_00/ui_mp/pc_options_actions.menu b/iw4x/iw4x_00/ui_mp/pc_options_actions.menu index 7b10210..92df6b6 100644 --- a/iw4x/iw4x_00/ui_mp/pc_options_actions.menu +++ b/iw4x/iw4x_00/ui_mp/pc_options_actions.menu @@ -43,49 +43,51 @@ #define ON_GPAD_USED when(dvarBool("gpad_in_use") == 1) #define ON_GPAD_UNUSED when(dvarBool("gpad_in_use") == 0) -menuDef { - name MENU_NAME - rect 0 0 640 480 - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - blurWorld 7 + menuDef + { + name MENU_NAME + rect 0 0 640 480 + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + blurWorld 7 - MENU_ON_OPEN(ON_MENU_OPEN) - MENU_ON_CLOSE(ON_MENU_CLOSE) - MENU_ON_ESC(ON_MENU_ESC) + MENU_ON_OPEN(ON_MENU_OPEN) + MENU_ON_CLOSE(ON_MENU_CLOSE) + MENU_ON_ESC(ON_MENU_ESC) - #define BACKGROUND_PC_OPTIONS - #define BACKGROUND_IW4 - #define DISABLE_SIDEBAR - #define BACKGROUND_FULL - #include "ui_mp/bg.inc" + #define BACKGROUND_PC_OPTIONS + #define BACKGROUND_IW4 + #define DISABLE_SIDEBAR + #define BACKGROUND_FULL + #include "ui_mp/bg.inc" - PC_OPTIONS_SECTION_TITLE(MENU_TITLE) + PC_OPTIONS_SECTION_TITLE(MENU_TITLE) - PC_OPTIONS_KEYBINDING(0, "@MENU_FIRE_WEAPON", "+attack") - PC_OPTIONS_KEYBINDING(1, "@MENU_AIM_DOWN_THE_SIGHT", "+toggleads_throw") - PC_OPTIONS_KEYBINDING(2, "@MENU_HOLD_AIM_DOWN_SIGHT", "+speed_throw") - PC_OPTIONS_KEYBINDING(3, "@MENU_LEAN_LEFT", "+leanleft") - PC_OPTIONS_KEYBINDING(4, "@MENU_LEAN_RIGHT", "+leanright") - PC_OPTIONS_KEYBINDING_RAW(5, "@MENU_USE_RELOAD", "+usereload", ON_GPAD_USED) - PC_OPTIONS_KEYBINDING_RAW(5, "@MENU_RELOAD_WEAPON", "+reload", ON_GPAD_UNUSED) - PC_OPTIONS_KEYBINDING(6, "@MENU_SWITCH_WEAPON", "weapnext") - PC_OPTIONS_KEYBINDING(7, "@MENU_MELEE_ATTACK", "+melee") - PC_OPTIONS_KEYBINDING_RAW(8, "@MENU_USE", "+activate", ON_GPAD_UNUSED) - PC_OPTIONS_KEYBINDING(9, "@MENU_FRAG_EQUIPMENT", "+frag") - PC_OPTIONS_KEYBINDING(10, "@MENU_THROW_SPECIAL_GRENADE", "+smoke") - PC_OPTIONS_KEYBINDING(11, "@MENU_WEAPON_ATTACHMENT", "+actionslot 3") - PC_OPTIONS_KEYBINDING(12, "@MENU_INVENTORY_KILLSTREAK", "+actionslot 4") - PC_OPTIONS_KEYBINDING(13, "@MENU_SECONDARY_INVENTORY", "+actionslot 2") - PC_OPTIONS_KEYBINDING(14, "@MENU_NIGHT_VISION", "+actionslot 1") + PC_OPTIONS_KEYBINDING(0, "@MENU_FIRE_WEAPON", "+attack") + PC_OPTIONS_KEYBINDING(1, "@MENU_AIM_DOWN_THE_SIGHT", "+toggleads_throw") + PC_OPTIONS_KEYBINDING(2, "@MENU_HOLD_AIM_DOWN_SIGHT", "+speed_throw") + PC_OPTIONS_KEYBINDING(3, "@MENU_LEAN_LEFT", "+leanleft") + PC_OPTIONS_KEYBINDING(4, "@MENU_LEAN_RIGHT", "+leanright") + PC_OPTIONS_KEYBINDING_RAW(5, "@MENU_USE_RELOAD", "+usereload", ON_GPAD_USED) + PC_OPTIONS_KEYBINDING_RAW(5, "@MENU_RELOAD_WEAPON", "+reload", ON_GPAD_UNUSED) + PC_OPTIONS_KEYBINDING(6, "@MENU_SWITCH_WEAPON", "weapnext") + PC_OPTIONS_KEYBINDING(7, "@MENU_MELEE_ATTACK", "+melee") + PC_OPTIONS_KEYBINDING_RAW(8, "@MENU_USE", "+activate", ON_GPAD_UNUSED) + PC_OPTIONS_KEYBINDING(9, "@MENU_FRAG_EQUIPMENT", "+frag") + PC_OPTIONS_KEYBINDING(10, "@MENU_THROW_SPECIAL_GRENADE", "+smoke") + PC_OPTIONS_KEYBINDING(11, "@MENU_WEAPON_ATTACHMENT", "+actionslot 3") + PC_OPTIONS_KEYBINDING(12, "@MENU_INVENTORY_KILLSTREAK", "+actionslot 4") + PC_OPTIONS_KEYBINDING(13, "@MENU_SECONDARY_INVENTORY", "+actionslot 2") + PC_OPTIONS_KEYBINDING(14, "@MENU_NIGHT_VISION", "+actionslot 1") - PC_OPTIONS_SEPERATOR(14) + PC_OPTIONS_SEPERATOR(14) - PC_OPTIONS_KEYBINDING_RAW(15, "@MENU_SHOW_OBJECTIVES_SCORES", "togglescores", ON_GPAD_USED) - PC_OPTIONS_KEYBINDING_RAW(15, "@MENU_SHOW_OBJECTIVES_SCORES", "+scores", ON_GPAD_UNUSED) + PC_OPTIONS_KEYBINDING_RAW(15, "@MENU_SHOW_OBJECTIVES_SCORES", "togglescores", ON_GPAD_USED) + PC_OPTIONS_KEYBINDING_RAW(15, "@MENU_SHOW_OBJECTIVES_SCORES", "+scores", ON_GPAD_UNUSED) - PC_OPTIONS_KEYBINDSTATUS + PC_OPTIONS_KEYBINDSTATUS - ITEM_BUTTON_BACK(ON_MENU_ESC) -} \ No newline at end of file + ITEM_BUTTON_BACK(ON_MENU_ESC) + } +} diff --git a/iw4x/iw4x_00/ui_mp/pc_options_advanced_video.menu b/iw4x/iw4x_00/ui_mp/pc_options_advanced_video.menu index adc7cd6..0f8765c 100644 --- a/iw4x/iw4x_00/ui_mp/pc_options_advanced_video.menu +++ b/iw4x/iw4x_00/ui_mp/pc_options_advanced_video.menu @@ -43,49 +43,51 @@ #define ON_MENU_ESC \ close self; -menuDef { - name MENU_NAME - rect 0 0 640 480 - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - blurWorld 7 + menuDef + { + name MENU_NAME + rect 0 0 640 480 + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + blurWorld 7 - MENU_ON_OPEN(ON_MENU_OPEN) - MENU_ON_CLOSE(ON_MENU_CLOSE) - MENU_ON_ESC(ON_MENU_ESC) + MENU_ON_OPEN(ON_MENU_OPEN) + MENU_ON_CLOSE(ON_MENU_CLOSE) + MENU_ON_ESC(ON_MENU_ESC) - #define BACKGROUND_PC_OPTIONS - #define BACKGROUND_IW4 - #define DISABLE_SIDEBAR - #define BACKGROUND_FULL - #include "ui_mp/bg.inc" + #define BACKGROUND_PC_OPTIONS + #define BACKGROUND_IW4 + #define DISABLE_SIDEBAR + #define BACKGROUND_FULL + #include "ui_mp/bg.inc" - PC_OPTIONS_SECTION_TITLE(MENU_TITLE) + PC_OPTIONS_SECTION_TITLE(MENU_TITLE) - PC_OPTIONS_FLOATLIST_RAW(0, "@MENU_ASPECT_RATIO", "ui_r_aspectratio", {"@MENU_AUTO" 0 "@MENU_STANDARD_4_3" 1 "@MENU_WIDE_16_10" 2 "@MENU_WIDE_16_9" 3}, setDvarInt r_aspectratio dvarInt("ui_r_aspectratio"); setLocalVarBool "ui_showApply" (1);, "@NULL_EMPTY", when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), 1) - PC_OPTIONS_FLOATLIST_RAW(1, "@MENU_ANTIALIASING", "ui_r_aasamples", {"@MENU_OFF" 1 "@MENU_2X" 2 "@MENU_4X" 4}, setLocalVarBool "ui_showApply" (1);, "@NULL_EMPTY", when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), 1) - PC_OPTIONS_DVARENUMLIST(2, "@MENU_SCREEN_REFRESH_RATE", "ui_r_displayRefresh", "r_displayRefresh", ACTION_SHOW_APPLY, when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby()))) - PC_OPTIONS_DVARYESNO_RAW(3, "@MENU_SYNC_EVERY_FRAME", "ui_r_vsync", ACTION_SHOW_APPLY, "@NULL_EMPTY", when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), 1) + PC_OPTIONS_FLOATLIST_RAW(0, "@MENU_ASPECT_RATIO", "ui_r_aspectratio", {"@MENU_AUTO" 0 "@MENU_STANDARD_4_3" 1 "@MENU_WIDE_16_10" 2 "@MENU_WIDE_16_9" 3}, setDvarInt r_aspectratio dvarInt("ui_r_aspectratio"); setLocalVarBool "ui_showApply" (1);, "@NULL_EMPTY", when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), 1) + PC_OPTIONS_FLOATLIST_RAW(1, "@MENU_ANTIALIASING", "ui_r_aasamples", {"@MENU_OFF" 1 "@MENU_2X" 2 "@MENU_4X" 4}, setLocalVarBool "ui_showApply" (1);, "@NULL_EMPTY", when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), 1) + PC_OPTIONS_DVARENUMLIST(2, "@MENU_SCREEN_REFRESH_RATE", "ui_r_displayRefresh", "r_displayRefresh", ACTION_SHOW_APPLY, when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby()))) + PC_OPTIONS_DVARYESNO_RAW(3, "@MENU_SYNC_EVERY_FRAME", "ui_r_vsync", ACTION_SHOW_APPLY, "@NULL_EMPTY", when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), 1) - PC_OPTIONS_SEPERATOR(3) + PC_OPTIONS_SEPERATOR(3) - PC_OPTIONS_DVARYESNO(4, "@MENU_SHADOWS", "sm_enable", ;, when(0)) - PC_OPTIONS_DVARYESNO(5, "@MENU_SPECULAR_MAP", "r_specular", ;, when(0)) - PC_OPTIONS_DVARYESNO(6, "@MENU_DOF", "r_dof_enable", ;, when(0)) + PC_OPTIONS_DVARYESNO(4, "@MENU_SHADOWS", "sm_enable", ;, when(0)) + PC_OPTIONS_DVARYESNO(5, "@MENU_SPECULAR_MAP", "r_specular", ;, when(0)) + PC_OPTIONS_DVARYESNO(6, "@MENU_DOF", "r_dof_enable", ;, when(0)) - PC_OPTIONS_SEPERATOR(6) + PC_OPTIONS_SEPERATOR(6) - PC_OPTIONS_DVARYESNO(7, "@MENU_ZFEATHER_SMOKE", "r_zfeather", ;, when(0)) - PC_OPTIONS_DVARYESNO(8, "@MENU_RAGDOLL", "ragdoll_enable", ;, when(0)) - PC_OPTIONS_DVARYESNO(9, "@MENU_BULLET_IMPACTS", "fx_marks", ;, when(0)) + PC_OPTIONS_DVARYESNO(7, "@MENU_ZFEATHER_SMOKE", "r_zfeather", ;, when(0)) + PC_OPTIONS_DVARYESNO(8, "@MENU_RAGDOLL", "ragdoll_enable", ;, when(0)) + PC_OPTIONS_DVARYESNO(9, "@MENU_BULLET_IMPACTS", "fx_marks", ;, when(0)) - PC_OPTIONS_SEPERATOR(9) + PC_OPTIONS_SEPERATOR(9) - PC_OPTIONS_FLOATLIST_RAW(10, "@MENU_TEXTURE_QUALITY", "ui_r_picmip_manual", {"@MENU_AUTOMATIC" 0 "@MENU_MANUAL" 1}, setLocalVarBool "ui_showApply" (1);, "@NULL_EMPTY", when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), 1) - PC_OPTIONS_FLOATLIST_RAW(11, "@MENU_TEXTURE_RESOLUTION", "ui_r_picmip", {"@MENU_LOW" 3 "@MENU_NORMAL" 2 "@MENU_HIGH" 1 "@MENU_EXTRA" 0}, setLocalVarBool "ui_showApply" (1);, "@NULL_EMPTY", when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), when(dvarBool("ui_r_picmip_manual"))) - PC_OPTIONS_FLOATLIST_RAW(12, "@MENU_NORMAL_MAP_RESOLUTION", "ui_r_picmip_bump", {"@MENU_LOW" 3 "@MENU_NORMAL" 2 "@MENU_HIGH" 1 "@MENU_EXTRA" 0}, setLocalVarBool "ui_showApply" (1);, "@NULL_EMPTY", when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), when(dvarBool("ui_r_picmip_manual"))) - PC_OPTIONS_FLOATLIST_RAW(13, "@MENU_SPECULAR_MAP_RESOLUTION", "ui_r_picmip_spec", {"@MENU_LOW" 3 "@MENU_NORMAL" 2 "@MENU_HIGH" 1 "@MENU_EXTRA" 0}, setLocalVarBool "ui_showApply" (1);, "@NULL_EMPTY", when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), when(dvarBool("ui_r_picmip_manual"))) + PC_OPTIONS_FLOATLIST_RAW(10, "@MENU_TEXTURE_QUALITY", "ui_r_picmip_manual", {"@MENU_AUTOMATIC" 0 "@MENU_MANUAL" 1}, setLocalVarBool "ui_showApply" (1);, "@NULL_EMPTY", when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), 1) + PC_OPTIONS_FLOATLIST_RAW(11, "@MENU_TEXTURE_RESOLUTION", "ui_r_picmip", {"@MENU_LOW" 3 "@MENU_NORMAL" 2 "@MENU_HIGH" 1 "@MENU_EXTRA" 0}, setLocalVarBool "ui_showApply" (1);, "@NULL_EMPTY", when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), when(dvarBool("ui_r_picmip_manual"))) + PC_OPTIONS_FLOATLIST_RAW(12, "@MENU_NORMAL_MAP_RESOLUTION", "ui_r_picmip_bump", {"@MENU_LOW" 3 "@MENU_NORMAL" 2 "@MENU_HIGH" 1 "@MENU_EXTRA" 0}, setLocalVarBool "ui_showApply" (1);, "@NULL_EMPTY", when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), when(dvarBool("ui_r_picmip_manual"))) + PC_OPTIONS_FLOATLIST_RAW(13, "@MENU_SPECULAR_MAP_RESOLUTION", "ui_r_picmip_spec", {"@MENU_LOW" 3 "@MENU_NORMAL" 2 "@MENU_HIGH" 1 "@MENU_EXTRA" 0}, setLocalVarBool "ui_showApply" (1);, "@NULL_EMPTY", when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), when(dvarBool("ui_r_picmip_manual"))) - ITEM_BUTTON_BACK(ON_MENU_ESC) + ITEM_BUTTON_BACK(ON_MENU_ESC) + } } diff --git a/iw4x/iw4x_00/ui_mp/pc_options_audio.menu b/iw4x/iw4x_00/ui_mp/pc_options_audio.menu index e6084d3..f5c1ace 100644 --- a/iw4x/iw4x_00/ui_mp/pc_options_audio.menu +++ b/iw4x/iw4x_00/ui_mp/pc_options_audio.menu @@ -56,29 +56,31 @@ execnow "profile_menuDvarsFinish; resetViewport"; \ setLocalVarString ui_hint_text "@NULL_EMPTY"; -menuDef { - name MENU_NAME - rect 0 0 640 480 - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - blurWorld 7 + menuDef + { + name MENU_NAME + rect 0 0 640 480 + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + blurWorld 7 - MENU_ON_OPEN(ON_MENU_OPEN) - MENU_ON_ESC(ON_MENU_ESC) + MENU_ON_OPEN(ON_MENU_OPEN) + MENU_ON_ESC(ON_MENU_ESC) - #define BACKGROUND_PC_OPTIONS - #define BACKGROUND_IW4 - #define SIDEBAR_RIGHT - #include "ui_mp/bg.inc" + #define BACKGROUND_PC_OPTIONS + #define BACKGROUND_IW4 + #define SIDEBAR_RIGHT + #include "ui_mp/bg.inc" - #include "ui_mp/leftside_options.inc" + #include "ui_mp/leftside_options.inc" - PC_OPTIONS_SECTION_TITLE(MENU_TITLE) + PC_OPTIONS_SECTION_TITLE(MENU_TITLE) - PC_OPTIONS_DVARSLIDER_RAW(0, "@MENU_MASTER_VOLUME", "snd_volume", 0, 1, 0, ;, ;, ;, when(0), 1, 1) - PC_OPTIONS_STRLIST_RAW(1, "@MENU_SPEAKER_CONFIG", "ui_outputConfig", {"@MENU_WINDOWS_DEFAULT"; "Windows default"; "@MENU_MONO"; "Mono"; "@MENU_STEREO"; "Stereo"; "@MENU_FOUR_SPEAKERS"; "4 speakers"; "@MENU_FIVE_ONE_SPEAKERS"; "5.1 speakers"}, setLocalVarBool "ui_showAudioApply" (1);, ;, when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), 1) - PC_OPTIONS_SEPERATOR(1) - PC_OPTIONS_DVARYESNO(2, "@MPUI_ENABLE_VOICE_CHAT", "cl_voice", ;, when(0)) - PC_OPTIONS_KEYBINDING(3, "@MENU_VOICE_CHAT_BUTTON", "+talk") + PC_OPTIONS_DVARSLIDER_RAW(0, "@MENU_MASTER_VOLUME", "snd_volume", 0, 1, 0, ;, ;, ;, when(0), 1, 1) + PC_OPTIONS_STRLIST_RAW(1, "@MENU_SPEAKER_CONFIG", "ui_outputConfig", {"@MENU_WINDOWS_DEFAULT"; "Windows default"; "@MENU_MONO"; "Mono"; "@MENU_STEREO"; "Stereo"; "@MENU_FOUR_SPEAKERS"; "4 speakers"; "@MENU_FIVE_ONE_SPEAKERS"; "5.1 speakers"}, setLocalVarBool "ui_showAudioApply" (1);, ;, when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), 1) + PC_OPTIONS_SEPERATOR(1) + PC_OPTIONS_DVARYESNO(2, "@MPUI_ENABLE_VOICE_CHAT", "cl_voice", ;, when(0)) + PC_OPTIONS_KEYBINDING(3, "@MENU_VOICE_CHAT_BUTTON", "+talk") + } } diff --git a/iw4x/iw4x_00/ui_mp/pc_options_controls.menu b/iw4x/iw4x_00/ui_mp/pc_options_controls.menu index 0b83c71..48334df 100644 --- a/iw4x/iw4x_00/ui_mp/pc_options_controls.menu +++ b/iw4x/iw4x_00/ui_mp/pc_options_controls.menu @@ -56,67 +56,69 @@ execnow "profile_menuDvarsFinish; resetViewport"; \ setLocalVarString ui_hint_text "@NULL_EMPTY"; -menuDef { - name MENU_NAME - rect 0 0 640 480 - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - blurWorld 7 - - MENU_ON_OPEN(ON_MENU_OPEN) - MENU_ON_CLOSE(ON_MENU_CLOSE) - MENU_ON_ESC(ON_MENU_ESC) - - #define BACKGROUND_PC_OPTIONS - #define BACKGROUND_IW4 - #define SIDEBAR_RIGHT - #include "ui_mp/bg.inc" - - #include "ui_mp/leftside_options.inc" - - PC_OPTIONS_SECTION_TITLE(MENU_TITLE) - - PC_OPTIONS_BUTTON_RIGHT(0, "buttonMovement", "@MENU_MOVEMENT", open "pc_options_movement"; close self;) - PC_OPTIONS_BUTTON_RIGHT(1, "buttonActions", "@MENU_ACTIONS", open "pc_options_actions"; close self;) - PC_OPTIONS_BUTTON_RIGHT(2, "buttonLook", "@MENU_LOOK", open "pc_options_look"; close self;) - PC_OPTIONS_BUTTON_RIGHT(3, "buttonChat", "@MENU_CHAT", open "controls_multi"; close self;) - - PC_OPTIONS_SEPERATOR(3) - - itemDef + menuDef { - rect 302 CHOICE_Y(4) 225 20 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP - style WINDOW_STYLE_FILLED - type ITEM_TYPE_BUTTON - foreColor CHOICE_TEXTCOLOR - disableColor 0.6 0.55 0.55 1 - background "menu_setting_selection_bar" - textFont UI_FONT_SMALL - textAlign ITEM_ALIGN_TOP_LEFT - textAlignX 60 - textScale CHOICE_TEXTSIZE - text "@MENU_RESTORE_DEFAULT_CONTROLS" - visible 1 - mouseEnter + name MENU_NAME + rect 0 0 640 480 + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + blurWorld 7 + + MENU_ON_OPEN(ON_MENU_OPEN) + MENU_ON_CLOSE(ON_MENU_CLOSE) + MENU_ON_ESC(ON_MENU_ESC) + + #define BACKGROUND_PC_OPTIONS + #define BACKGROUND_IW4 + #define SIDEBAR_RIGHT + #include "ui_mp/bg.inc" + + #include "ui_mp/leftside_options.inc" + + PC_OPTIONS_SECTION_TITLE(MENU_TITLE) + + PC_OPTIONS_BUTTON_RIGHT(0, "buttonMovement", "@MENU_MOVEMENT", open "pc_options_movement"; close self;) + PC_OPTIONS_BUTTON_RIGHT(1, "buttonActions", "@MENU_ACTIONS", open "pc_options_actions"; close self;) + PC_OPTIONS_BUTTON_RIGHT(2, "buttonLook", "@MENU_LOOK", open "pc_options_look"; close self;) + PC_OPTIONS_BUTTON_RIGHT(3, "buttonChat", "@MENU_CHAT", open "controls_multi"; close self;) + + PC_OPTIONS_SEPERATOR(3) + + itemDef { - play CHOICE_FOCUS_SOUND; - } - onFocus - { - setItemColor self backColor 0 0 0 1; - setLocalVarString ui_hint_text("@NULL_EMPTY"); - setLocalVarFloat ui_popupYPos (getFocusedItemY()); - } - leaveFocus - { - setItemColor self backColor 0 0 0 0; - setLocalVarString ui_hint_text("@NULL_EMPTY"); - } - action - { - play CHOICE_CLICK_SOUND; - open "options_control_defaults"; + rect 302 CHOICE_Y(4) 225 20 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP + style WINDOW_STYLE_FILLED + type ITEM_TYPE_BUTTON + foreColor CHOICE_TEXTCOLOR + disableColor 0.6 0.55 0.55 1 + background "menu_setting_selection_bar" + textFont UI_FONT_SMALL + textAlign ITEM_ALIGN_TOP_LEFT + textAlignX 60 + textScale CHOICE_TEXTSIZE + text "@MENU_RESTORE_DEFAULT_CONTROLS" + visible 1 + mouseEnter + { + play CHOICE_FOCUS_SOUND; + } + onFocus + { + setItemColor self backColor 0 0 0 1; + setLocalVarString ui_hint_text("@NULL_EMPTY"); + setLocalVarFloat ui_popupYPos (getFocusedItemY()); + } + leaveFocus + { + setItemColor self backColor 0 0 0 0; + setLocalVarString ui_hint_text("@NULL_EMPTY"); + } + action + { + play CHOICE_CLICK_SOUND; + open "options_control_defaults"; + } } } } diff --git a/iw4x/iw4x_00/ui_mp/pc_options_game.menu b/iw4x/iw4x_00/ui_mp/pc_options_game.menu index 51139ba..1be2db7 100644 --- a/iw4x/iw4x_00/ui_mp/pc_options_game.menu +++ b/iw4x/iw4x_00/ui_mp/pc_options_game.menu @@ -54,33 +54,35 @@ execnow "profile_menuDvarsFinish; resetViewport"; \ setLocalVarString ui_hint_text "@NULL_EMPTY"; -menuDef { - name MENU_NAME - rect 0 0 640 480 - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - blurWorld 7 + menuDef + { + name MENU_NAME + rect 0 0 640 480 + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + blurWorld 7 - MENU_ON_OPEN(ON_MENU_OPEN) - MENU_ON_CLOSE(ON_MENU_CLOSE) - MENU_ON_ESC(ON_MENU_ESC) + MENU_ON_OPEN(ON_MENU_OPEN) + MENU_ON_CLOSE(ON_MENU_CLOSE) + MENU_ON_ESC(ON_MENU_ESC) - #define BACKGROUND_PC_OPTIONS - #define BACKGROUND_IW4 - #define SIDEBAR_RIGHT - #include "ui_mp/bg.inc" + #define BACKGROUND_PC_OPTIONS + #define BACKGROUND_IW4 + #define SIDEBAR_RIGHT + #include "ui_mp/bg.inc" - #include "ui_mp/leftside_options.inc" + #include "ui_mp/leftside_options.inc" - PC_OPTIONS_SECTION_TITLE(MENU_TITLE) + PC_OPTIONS_SECTION_TITLE(MENU_TITLE) - PC_OPTIONS_DVARYESNO(0, "@MENU_SHOW_BLOOD", "cg_blood", ;, when(0)) - PC_OPTIONS_DVARYESNO_RAW(1, "@MENU_NEWCOLORS", "cg_newColors", ;, "@MPUI_DESC_NEWCOLORS", when(0), 1) + PC_OPTIONS_DVARYESNO(0, "@MENU_SHOW_BLOOD", "cg_blood", ;, when(0)) + PC_OPTIONS_DVARYESNO_RAW(1, "@MENU_NEWCOLORS", "cg_newColors", ;, "@MPUI_DESC_NEWCOLORS", when(0), 1) - PC_OPTIONS_SEPERATOR(1) + PC_OPTIONS_SEPERATOR(1) - PC_OPTIONS_DVARYESNO_RAW(2, "@MENU_AUTORECORD", "cl_autoRecord", ;, "@MPUI_DESC_AUTORECORD", when(0), 1) - PC_OPTIONS_EDITFIELD_RAW(3, "@MENU_DEMOS_KEEP", "cl_demosKeep", 3, "@MPUI_DESC_DEMOS_KEEP", 1) - PC_OPTIONS_DVARYESNO(4, "@MENU_COLORBLIND_MODE", "r_colorBlindTeams", ;, when(0)) + PC_OPTIONS_DVARYESNO_RAW(2, "@MENU_AUTORECORD", "cl_autoRecord", ;, "@MPUI_DESC_AUTORECORD", when(0), 1) + PC_OPTIONS_EDITFIELD_RAW(3, "@MENU_DEMOS_KEEP", "cl_demosKeep", 3, "@MPUI_DESC_DEMOS_KEEP", 1) + PC_OPTIONS_DVARYESNO(4, "@MENU_COLORBLIND_MODE", "r_colorBlindTeams", ;, when(0)) + } } diff --git a/iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu b/iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu index 5b0eda9..a1b2195 100644 --- a/iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu +++ b/iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu @@ -80,53 +80,55 @@ execnow "bindgpbuttonsconfigs"; \ } -menuDef { - name MENU_NAME - rect 0 0 640 480 - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - blurWorld 7 + menuDef + { + name MENU_NAME + rect 0 0 640 480 + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + blurWorld 7 - MENU_ON_OPEN(ON_MENU_OPEN) - MENU_ON_CLOSE(ON_MENU_CLOSE) - MENU_ON_ESC(ON_MENU_ESC) + MENU_ON_OPEN(ON_MENU_OPEN) + MENU_ON_CLOSE(ON_MENU_CLOSE) + MENU_ON_ESC(ON_MENU_ESC) - #define BACKGROUND_PC_OPTIONS - #define BACKGROUND_IW4 - #define SIDEBAR_RIGHT - #include "ui_mp/bg.inc" + #define BACKGROUND_PC_OPTIONS + #define BACKGROUND_IW4 + #define SIDEBAR_RIGHT + #include "ui_mp/bg.inc" - #include "ui_mp/leftside_options.inc" + #include "ui_mp/leftside_options.inc" - PC_OPTIONS_SECTION_TITLE(MENU_TITLE) + PC_OPTIONS_SECTION_TITLE(MENU_TITLE) - PC_OPTIONS_DVARYESNO_RAW(0, "@MENU_GAMEPAD_ENABLED", "gpad_enabled", ON_GAMEPAD_ENABLED_TOGGLE;, "@MPUI_DESC_GAMEPAD_ENABLED", when(0), 1) - PC_OPTIONS_SEPERATOR_VIS(0, ON_GPAD_ENABLED) + PC_OPTIONS_DVARYESNO_RAW(0, "@MENU_GAMEPAD_ENABLED", "gpad_enabled", ON_GAMEPAD_ENABLED_TOGGLE;, "@MPUI_DESC_GAMEPAD_ENABLED", when(0), 1) + PC_OPTIONS_SEPERATOR_VIS(0, ON_GPAD_ENABLED) - PC_OPTIONS_DVARYESNO_RAW(1, "@MENU_LOOK_INVERSION", "input_invertPitch", ;, "@MPUI_DESC_LOOK_INVERSION", ON_GPAD_DISABLED, ON_GPAD_ENABLED) - PC_OPTIONS_STRLIST_RAW(2, "@MENU_THUMBSTICK_LAYOUT", "gpad_sticksConfig", - {"@MENU_DEFAULT"; "thumbstick_default"; - "@MENU_SOUTHPAW"; "thumbstick_southpaw"; - "@MENU_LEGACY"; "thumbstick_legacy"; - "@MENU_LEGACY_SOUTHPAW"; "thumbstick_legacysouthpaw"}, execNow "bindgpsticksconfigs";, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED) - PC_OPTIONS_STRLIST_RAW(3, "@MENU_BUTTON_LAYOUT", "gpad_buttonConfig", - {"@MENU_DEFAULT"; "buttons_default"; - "@MENU_TACTICAL"; "buttons_tactical"; - "@MENU_LEFTY"; "buttons_lefty"; - "@MENU_NOMAD"; "buttons_nomad"; - "@MENU_DEFAULT_ALT"; "buttons_default_alt"; - "@MENU_TACTICAL_ALT"; "buttons_tactical_alt"; - "@MENU_LEFTY_ALT"; "buttons_lefty_alt"; - "@MENU_NOMAD_ALT"; "buttons_nomad_alt"}, execNow "bindgpbuttonsconfigs";, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED) - PC_OPTIONS_FLOATLIST_RAW(4, "@MENU_GPAD_STYLE", "gpad_style", {"@MENU_GPAD_XBOX_CAPS" 0 "@MENU_GPAD_PS_CAPS" 1}, ;, "@MPUI_DESC_GPAD_STYLE", ON_GPAD_DISABLED, ON_GPAD_ENABLED) - PC_OPTIONS_DVARYESNO_RAW(5, "@MENU_SLOWDOWN_ENABLED", "gpad_slowdown_enabled", ;, "@MPUI_DESC_SLOWDOWN_ENABLED", ON_GPAD_DISABLED, ON_GPAD_ENABLED) - PC_OPTIONS_DVARYESNO_RAW(6, "@MENU_LOCKON_ENABLED", "gpad_lockon_enabled", ;, "@MPUI_DESC_LOCKON_ENABLED", ON_GPAD_DISABLED, ON_GPAD_ENABLED) - PC_OPTIONS_SEPERATOR_VIS(6, ON_GPAD_ENABLED) - PC_OPTIONS_DVARSLIDER_RAW(7, "@MENU_LOOK_SENSITIVITY", "input_viewSensitivity", 0.5, 4, 1.0, ;, ;, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED, ON_GPAD_ENABLED) - PC_OPTIONS_FLOATLIST_RAW(8, "@MENU_LOOK_SENSITIVITY_PRESET", "input_viewSensitivity", - {"@MENU_SENSITIVITY_LOW_CAPS" SENSITIVITY_1 "@MENU_SENSITIVITY_MEDIUM_CAPS" SENSITIVITY_2 "3" SENSITIVITY_3 - "@MENU_SENSITIVITY_HIGH_CAPS" SENSITIVITY_4 "5" SENSITIVITY_5 "6" SENSITIVITY_6 - "@MENU_SENSITIVITY_VERY_HIGH_CAPS" SENSITIVITY_7 "8" SENSITIVITY_8 "9" SENSITIVITY_9 "@MENU_SENSITIVITY_INSANE_CAPS" SENSITIVITY_10}, - ;, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED) + PC_OPTIONS_DVARYESNO_RAW(1, "@MENU_LOOK_INVERSION", "input_invertPitch", ;, "@MPUI_DESC_LOOK_INVERSION", ON_GPAD_DISABLED, ON_GPAD_ENABLED) + PC_OPTIONS_STRLIST_RAW(2, "@MENU_THUMBSTICK_LAYOUT", "gpad_sticksConfig", + {"@MENU_DEFAULT"; "thumbstick_default"; + "@MENU_SOUTHPAW"; "thumbstick_southpaw"; + "@MENU_LEGACY"; "thumbstick_legacy"; + "@MENU_LEGACY_SOUTHPAW"; "thumbstick_legacysouthpaw"}, execNow "bindgpsticksconfigs";, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED) + PC_OPTIONS_STRLIST_RAW(3, "@MENU_BUTTON_LAYOUT", "gpad_buttonConfig", + {"@MENU_DEFAULT"; "buttons_default"; + "@MENU_TACTICAL"; "buttons_tactical"; + "@MENU_LEFTY"; "buttons_lefty"; + "@MENU_NOMAD"; "buttons_nomad"; + "@MENU_DEFAULT_ALT"; "buttons_default_alt"; + "@MENU_TACTICAL_ALT"; "buttons_tactical_alt"; + "@MENU_LEFTY_ALT"; "buttons_lefty_alt"; + "@MENU_NOMAD_ALT"; "buttons_nomad_alt"}, execNow "bindgpbuttonsconfigs";, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED) + PC_OPTIONS_FLOATLIST_RAW(4, "@MENU_GPAD_STYLE", "gpad_style", {"@MENU_GPAD_XBOX_CAPS" 0 "@MENU_GPAD_PS_CAPS" 1}, ;, "@MPUI_DESC_GPAD_STYLE", ON_GPAD_DISABLED, ON_GPAD_ENABLED) + PC_OPTIONS_DVARYESNO_RAW(5, "@MENU_SLOWDOWN_ENABLED", "gpad_slowdown_enabled", ;, "@MPUI_DESC_SLOWDOWN_ENABLED", ON_GPAD_DISABLED, ON_GPAD_ENABLED) + PC_OPTIONS_DVARYESNO_RAW(6, "@MENU_LOCKON_ENABLED", "gpad_lockon_enabled", ;, "@MPUI_DESC_LOCKON_ENABLED", ON_GPAD_DISABLED, ON_GPAD_ENABLED) + PC_OPTIONS_SEPERATOR_VIS(6, ON_GPAD_ENABLED) + PC_OPTIONS_DVARSLIDER_RAW(7, "@MENU_LOOK_SENSITIVITY", "input_viewSensitivity", 0.5, 4, 1.0, ;, ;, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED, ON_GPAD_ENABLED) + PC_OPTIONS_FLOATLIST_RAW(8, "@MENU_LOOK_SENSITIVITY_PRESET", "input_viewSensitivity", + {"@MENU_SENSITIVITY_LOW_CAPS" SENSITIVITY_1 "@MENU_SENSITIVITY_MEDIUM_CAPS" SENSITIVITY_2 "3" SENSITIVITY_3 + "@MENU_SENSITIVITY_HIGH_CAPS" SENSITIVITY_4 "5" SENSITIVITY_5 "6" SENSITIVITY_6 + "@MENU_SENSITIVITY_VERY_HIGH_CAPS" SENSITIVITY_7 "8" SENSITIVITY_8 "9" SENSITIVITY_9 "@MENU_SENSITIVITY_INSANE_CAPS" SENSITIVITY_10}, + ;, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED) + } } diff --git a/iw4x/iw4x_00/ui_mp/pc_options_look.menu b/iw4x/iw4x_00/ui_mp/pc_options_look.menu index 1e784af..83232d6 100644 --- a/iw4x/iw4x_00/ui_mp/pc_options_look.menu +++ b/iw4x/iw4x_00/ui_mp/pc_options_look.menu @@ -40,53 +40,55 @@ #define ON_MENU_ESC \ close self; -menuDef { - name MENU_NAME - rect 0 0 640 480 - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - blurWorld 7 - - MENU_ON_OPEN(ON_MENU_OPEN) - MENU_ON_CLOSE(ON_MENU_CLOSE) - MENU_ON_ESC(ON_MENU_ESC) - - #define BACKGROUND_PC_OPTIONS - #define BACKGROUND_IW4 - #define DISABLE_SIDEBAR - #define BACKGROUND_FULL - #include "ui_mp/bg.inc" - - PC_OPTIONS_SECTION_TITLE(MENU_TITLE) - - itemDef + menuDef { - rect 422 28 344 20 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP - decoration - visible 1 - foreColor CHOICE_TEXTCOLOR - disableColor 0.6 0.55 0.55 1 - textFont UI_FONT_SMALL - textAlign ITEM_ALIGN_TOP_RIGHT - textAlignX -190 - textScale CHOICE_TEXTSIZE - exp text(dvarString("sensitivity")) + name MENU_NAME + rect 0 0 640 480 + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + blurWorld 7 + + MENU_ON_OPEN(ON_MENU_OPEN) + MENU_ON_CLOSE(ON_MENU_CLOSE) + MENU_ON_ESC(ON_MENU_ESC) + + #define BACKGROUND_PC_OPTIONS + #define BACKGROUND_IW4 + #define DISABLE_SIDEBAR + #define BACKGROUND_FULL + #include "ui_mp/bg.inc" + + PC_OPTIONS_SECTION_TITLE(MENU_TITLE) + + itemDef + { + rect 422 28 344 20 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP + decoration + visible 1 + foreColor CHOICE_TEXTCOLOR + disableColor 0.6 0.55 0.55 1 + textFont UI_FONT_SMALL + textAlign ITEM_ALIGN_TOP_RIGHT + textAlignX -190 + textScale CHOICE_TEXTSIZE + exp text(dvarString("sensitivity")) + } + + PC_OPTIONS_DVARSLIDER(0, "@MENU_MOUSE_SENSITIVITY", "sensitivity", 0.1, 10, 5, ;, ;, ;, when(0)) + PC_OPTIONS_DVARYESNO(1, "@MENU_INVERT_MOUSE", "ui_mousePitch", uiscript updateui_mousePitch;, when(0)) + + PC_OPTIONS_SEPERATOR(1) + + PC_OPTIONS_DVARYESNO(2, "@MENU_SMOOTH_MOUSE", "m_filter", ;, when(0)) + PC_OPTIONS_DVARYESNO(3, "@MENU_FREE_LOOK", "cl_freelook", ;, when(0)) + PC_OPTIONS_KEYBINDING(4, "@MENU_LOOK_UP", "+lookup") + PC_OPTIONS_KEYBINDING(5, "@MENU_LOOK_DOWN", "+lookdown") + PC_OPTIONS_KEYBINDING(6, "@MENU_HOLD_MOUSE_LOOK", "+mlook") + PC_OPTIONS_KEYBINDING(7, "@MENU_CENTER_VIEW", "centerview") + + PC_OPTIONS_KEYBINDSTATUS + + ITEM_BUTTON_BACK(ON_MENU_ESC) } - - PC_OPTIONS_DVARSLIDER(0, "@MENU_MOUSE_SENSITIVITY", "sensitivity", 0.1, 10, 5, ;, ;, ;, when(0)) - PC_OPTIONS_DVARYESNO(1, "@MENU_INVERT_MOUSE", "ui_mousePitch", uiscript updateui_mousePitch;, when(0)) - - PC_OPTIONS_SEPERATOR(1) - - PC_OPTIONS_DVARYESNO(2, "@MENU_SMOOTH_MOUSE", "m_filter", ;, when(0)) - PC_OPTIONS_DVARYESNO(3, "@MENU_FREE_LOOK", "cl_freelook", ;, when(0)) - PC_OPTIONS_KEYBINDING(4, "@MENU_LOOK_UP", "+lookup") - PC_OPTIONS_KEYBINDING(5, "@MENU_LOOK_DOWN", "+lookdown") - PC_OPTIONS_KEYBINDING(6, "@MENU_HOLD_MOUSE_LOOK", "+mlook") - PC_OPTIONS_KEYBINDING(7, "@MENU_CENTER_VIEW", "centerview") - - PC_OPTIONS_KEYBINDSTATUS - - ITEM_BUTTON_BACK(ON_MENU_ESC) } diff --git a/iw4x/iw4x_00/ui_mp/pc_options_movement.menu b/iw4x/iw4x_00/ui_mp/pc_options_movement.menu index f44a11c..0d50c85 100644 --- a/iw4x/iw4x_00/ui_mp/pc_options_movement.menu +++ b/iw4x/iw4x_00/ui_mp/pc_options_movement.menu @@ -40,49 +40,51 @@ #define ON_MENU_ESC \ close self; -menuDef { - name MENU_NAME - rect 0 0 640 480 - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - blurWorld 7 + menuDef + { + name MENU_NAME + rect 0 0 640 480 + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + blurWorld 7 - MENU_ON_OPEN(ON_MENU_OPEN) - MENU_ON_CLOSE(ON_MENU_CLOSE) - MENU_ON_ESC(ON_MENU_ESC) + MENU_ON_OPEN(ON_MENU_OPEN) + MENU_ON_CLOSE(ON_MENU_CLOSE) + MENU_ON_ESC(ON_MENU_ESC) - #define BACKGROUND_PC_OPTIONS - #define BACKGROUND_IW4 - #define DISABLE_SIDEBAR - #define BACKGROUND_FULL - #include "ui_mp/bg.inc" + #define BACKGROUND_PC_OPTIONS + #define BACKGROUND_IW4 + #define DISABLE_SIDEBAR + #define BACKGROUND_FULL + #include "ui_mp/bg.inc" - PC_OPTIONS_SECTION_TITLE(MENU_TITLE) + PC_OPTIONS_SECTION_TITLE(MENU_TITLE) - PC_OPTIONS_KEYBINDING(0, "@MENU_FORWARD", "+forward") - PC_OPTIONS_KEYBINDING(1, "@MENU_MOVE_BACK", "+back") - PC_OPTIONS_KEYBINDING(2, "@MENU_MOVE_LEFT", "+moveleft") - PC_OPTIONS_KEYBINDING(3, "@MENU_MOVE_RIGHT", "+moveright") - PC_OPTIONS_KEYBINDING(4, "@MENU_STANDJUMP", "+gostand") - PC_OPTIONS_KEYBINDING(5, "@MENU_CROUCH", "togglecrouch") - PC_OPTIONS_KEYBINDING(6, "@MENU_PRONE", "toggleprone") - PC_OPTIONS_KEYBINDING(7, "@MENU_SPRINT_HOLD_BREATH", "+breath_sprint") + PC_OPTIONS_KEYBINDING(0, "@MENU_FORWARD", "+forward") + PC_OPTIONS_KEYBINDING(1, "@MENU_MOVE_BACK", "+back") + PC_OPTIONS_KEYBINDING(2, "@MENU_MOVE_LEFT", "+moveleft") + PC_OPTIONS_KEYBINDING(3, "@MENU_MOVE_RIGHT", "+moveright") + PC_OPTIONS_KEYBINDING(4, "@MENU_STANDJUMP", "+gostand") + PC_OPTIONS_KEYBINDING(5, "@MENU_CROUCH", "togglecrouch") + PC_OPTIONS_KEYBINDING(6, "@MENU_PRONE", "toggleprone") + PC_OPTIONS_KEYBINDING(7, "@MENU_SPRINT_HOLD_BREATH", "+breath_sprint") - PC_OPTIONS_SEPERATOR(7) + PC_OPTIONS_SEPERATOR(7) - PC_OPTIONS_KEYBINDING(8, "@MENU_HOLD_DOWN_CROUCH", "+movedown") - PC_OPTIONS_KEYBINDING(9, "@MENU_HOLD_DOWN_PRONE", "+prone") - PC_OPTIONS_KEYBINDING(10, "@MENU_CHANGE_STANCE", "+stance") - PC_OPTIONS_KEYBINDING(11, "@MENU_SPRINT", "+sprint") - PC_OPTIONS_KEYBINDING(12, "@MENU_HOLD_BREATH", "+holdbreath") - PC_OPTIONS_KEYBINDING(13, "@MENU_TURN_LEFT", "+left") - PC_OPTIONS_KEYBINDING(14, "@MENU_TURN_RIGHT", "+right") - PC_OPTIONS_KEYBINDING(15, "@MENU_STRAFE", "+strafe") + PC_OPTIONS_KEYBINDING(8, "@MENU_HOLD_DOWN_CROUCH", "+movedown") + PC_OPTIONS_KEYBINDING(9, "@MENU_HOLD_DOWN_PRONE", "+prone") + PC_OPTIONS_KEYBINDING(10, "@MENU_CHANGE_STANCE", "+stance") + PC_OPTIONS_KEYBINDING(11, "@MENU_SPRINT", "+sprint") + PC_OPTIONS_KEYBINDING(12, "@MENU_HOLD_BREATH", "+holdbreath") + PC_OPTIONS_KEYBINDING(13, "@MENU_TURN_LEFT", "+left") + PC_OPTIONS_KEYBINDING(14, "@MENU_TURN_RIGHT", "+right") + PC_OPTIONS_KEYBINDING(15, "@MENU_STRAFE", "+strafe") - ITEM_BUTTON_BACK(ON_MENU_ESC) + ITEM_BUTTON_BACK(ON_MENU_ESC) - PC_OPTIONS_KEYBINDSTATUS + PC_OPTIONS_KEYBINDSTATUS - ITEM_BUTTON_BACK(ON_MENU_ESC) -} \ No newline at end of file + ITEM_BUTTON_BACK(ON_MENU_ESC) + } +} diff --git a/iw4x/iw4x_00/ui_mp/pc_options_multi.menu b/iw4x/iw4x_00/ui_mp/pc_options_multi.menu index e622309..ca4b120 100644 --- a/iw4x/iw4x_00/ui_mp/pc_options_multi.menu +++ b/iw4x/iw4x_00/ui_mp/pc_options_multi.menu @@ -58,42 +58,44 @@ execnow "profile_menuDvarsFinish; resetViewport"; \ setLocalVarString ui_hint_text "@NULL_EMPTY"; -menuDef { - name MENU_NAME - rect 0 0 640 480 - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - blurWorld 7 + menuDef + { + name MENU_NAME + rect 0 0 640 480 + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + blurWorld 7 - MENU_ON_OPEN(ON_MENU_OPEN) - MENU_ON_CLOSE(ON_MENU_CLOSE) - MENU_ON_ESC(ON_MENU_ESC) + MENU_ON_OPEN(ON_MENU_OPEN) + MENU_ON_CLOSE(ON_MENU_CLOSE) + MENU_ON_ESC(ON_MENU_ESC) - #define BACKGROUND_PC_OPTIONS - #define BACKGROUND_IW4 - #define SIDEBAR_RIGHT - #include "ui_mp/bg.inc" + #define BACKGROUND_PC_OPTIONS + #define BACKGROUND_IW4 + #define SIDEBAR_RIGHT + #include "ui_mp/bg.inc" - #include "ui_mp/leftside_options.inc" + #include "ui_mp/leftside_options.inc" - PC_OPTIONS_SECTION_TITLE(MENU_TITLE) + PC_OPTIONS_SECTION_TITLE(MENU_TITLE) - PC_OPTIONS_EDITFIELD(0, "@MENU_PLAYER_NAME", "ui_name", 15) + PC_OPTIONS_EDITFIELD(0, "@MENU_PLAYER_NAME", "ui_name", 15) - PC_OPTIONS_SEPERATOR(0) + PC_OPTIONS_SEPERATOR(0) - PC_OPTIONS_FLOATLIST_RAW(1, "@MENU_MAXPACKETS", "cl_maxpackets", {"30" 30 "100" 100 "125" 125}, ;, ;, when(0), 1) - PC_OPTIONS_FLOATLIST_RAW(2, "@MENU_SNAPS", "snaps", {"20" 20 "30" 30}, ;, ;, when(0), 1) + PC_OPTIONS_FLOATLIST_RAW(1, "@MENU_MAXPACKETS", "cl_maxpackets", {"30" 30 "100" 100 "125" 125}, ;, ;, when(0), 1) + PC_OPTIONS_FLOATLIST_RAW(2, "@MENU_SNAPS", "snaps", {"20" 20 "30" 30}, ;, ;, when(0), 1) - PC_OPTIONS_SEPERATOR(2) + PC_OPTIONS_SEPERATOR(2) - PC_OPTIONS_DVARYESNO(3, "@MENU_LAGOMETER", "drawLagometer", ;, when(0)) - PC_OPTIONS_STRLIST_RAW(4, "@MENU_DRAWFPS", "cg_drawFPS", {"Off"; "Off"; "Simple"; "Simple"; "SimpleRanges"; "SimpleRanges"; "Verbose"; "Verbose"; "Verbose+Viewpos"; "Verbose+Viewpos"}, ;, ;, when(0), 1) - PC_OPTIONS_DVARYESNO(5, "@MENU_FPSLABELS", "cg_drawFPSLabels", ;, when(0)) + PC_OPTIONS_DVARYESNO(3, "@MENU_LAGOMETER", "drawLagometer", ;, when(0)) + PC_OPTIONS_STRLIST_RAW(4, "@MENU_DRAWFPS", "cg_drawFPS", {"Off"; "Off"; "Simple"; "Simple"; "SimpleRanges"; "SimpleRanges"; "Verbose"; "Verbose"; "Verbose+Viewpos"; "Verbose+Viewpos"}, ;, ;, when(0), 1) + PC_OPTIONS_DVARYESNO(5, "@MENU_FPSLABELS", "cg_drawFPSLabels", ;, when(0)) - PC_OPTIONS_SEPERATOR(5) + PC_OPTIONS_SEPERATOR(5) - PC_OPTIONS_DVARYESNO_RAW(6, "@MENU_STREAMFRIENDLY_UI", "ui_streamFriendly", ;, "@MPUI_DESC_STREAM_FRIENDLY_UI", when(0), 1) - PC_OPTIONS_FLOATLIST_RAW(7, "@MENU_FRIENDNOTIFY", "cl_notifyFriendState", {"Always" -1 "Never" 0 "in Menu" 1}, ;, "@MPUI_DESC_FRIENDNOTIFY", when(dvarBool("ui_streamFriendly")), 1) + PC_OPTIONS_DVARYESNO_RAW(6, "@MENU_STREAMFRIENDLY_UI", "ui_streamFriendly", ;, "@MPUI_DESC_STREAM_FRIENDLY_UI", when(0), 1) + PC_OPTIONS_FLOATLIST_RAW(7, "@MENU_FRIENDNOTIFY", "cl_notifyFriendState", {"Always" -1 "Never" 0 "in Menu" 1}, ;, "@MPUI_DESC_FRIENDNOTIFY", when(dvarBool("ui_streamFriendly")), 1) + } } diff --git a/iw4x/iw4x_00/ui_mp/pc_options_video.menu b/iw4x/iw4x_00/ui_mp/pc_options_video.menu index 8a830df..e5da7c9 100644 --- a/iw4x/iw4x_00/ui_mp/pc_options_video.menu +++ b/iw4x/iw4x_00/ui_mp/pc_options_video.menu @@ -67,72 +67,74 @@ execnow "profile_menuDvarsFinish; resetViewport"; \ setLocalVarString ui_hint_text "@NULL_EMPTY"; -menuDef { - name MENU_NAME - rect 0 0 640 480 - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - blurWorld 7 - - MENU_ON_OPEN(ON_MENU_OPEN) - MENU_ON_CLOSE(ON_MENU_CLOSE) - MENU_ON_ESC(ON_MENU_ESC) - - #define BACKGROUND_PC_OPTIONS - #define BACKGROUND_IW4 - #define SIDEBAR_RIGHT - #include "ui_mp/bg.inc" - - #include "ui_mp/leftside_options.inc" - - PC_OPTIONS_SECTION_TITLE(MENU_TITLE) - - PC_OPTIONS_DVARENUMLIST(0, "@MENU_VIDEO_MODE", "ui_r_mode", "r_mode", ACTION_SHOW_APPLY, when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby()))) - PC_OPTIONS_DVARYESNO_RAW(1, "@MENU_D3D9EX", "r_useD3D9Ex", ACTION_SHOW_APPLY, "@MPUI_DESC_D3D9EX", when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), 1) - PC_OPTIONS_SEPERATOR(1) - - PC_OPTIONS_DVARYESNO(2, "@MENU_FULLSCREEN", "ui_r_fullscreen", ACTION_SHOW_APPLY exec "vid_xpos 0;vid_ypos 0";, when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby()))) - PC_OPTIONS_DVARYESNO_RAW(3, "@MENU_NOBORDER", "r_noborder", ACTION_SHOW_APPLY exec "vid_xpos 0;vid_ypos 0";, "@MPUI_DESC_NOBORDER", when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), 1) - PC_OPTIONS_DVARYESNO_RAW(4, "@MENU_NATIVECURSOR", "ui_nativeCursor", ;, "@MPUI_DESC_NATIVECURSOR", when(0), 1) - PC_OPTIONS_SEPERATOR(4) - - PC_OPTIONS_DVARSLIDER_RAW(5, "@MENU_BRIGHTNESS", "r_gamma", 0.5, 3, 0.8, setLocalVarBool ui_brightness_hint_display (1);, setLocalVarBool ui_brightness_hint_display (0);, execNow "profile_menuDvarsFinish";, when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), 1, 0) - PC_OPTIONS_FLOATLIST_RAW(6, "@MENU_FOV", "cg_fov", {"65 (Default)" 65 "80" 80 "90" 90 "120" 120}, execNow "profile_menuDvarsFinish";, "@MPUI_DESC_FOV", when(0), 1) - PC_OPTIONS_FLOATLIST_RAW(7, "@MENU_FOVSCALE", "cg_fovscale", {"1 (Default)" 1 "1.1" 1.1 "1.2" 1.2 "1.3" 1.3 "1.4" 1.4 "1.5" 1.5 "1.6" 1.6 "1.7" 1.7 "1.8" 1.8 "1.9" 1.9 "2" 2}, execNow "profile_menuDvarsFinish";, "@MPUI_DESC_FOVSCALE", when(0), 1) - PC_OPTIONS_FLOATLIST_RAW(8, "@MENU_MAXFPS", "com_maxfps", { "30" 30 "85 (Default)" 85 "125" 125 "250" 250 "333" 333 "Unlimited" 0}, ;, "@MPUI_DESC_MAXFPS", when(0), 1) - PC_OPTIONS_SEPERATOR(8) - - itemDef + menuDef { - rect 260 CHOICE_Y(9) 225 20 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP - style WINDOW_STYLE_FILLED - foreColor CHOICE_TEXTCOLOR - disablecolor 0.6 0.55 0.55 1 - background "menu_setting_selection_bar" - type ITEM_TYPE_BUTTON - textFont UI_FONT_SMALL - textAlign ITEM_ALIGN_TOP_RIGHT - textAlignX -60 - textScale CHOICE_TEXTSIZE - text "@MENU_ADVANCED_VIDEO" - visible 1 - mouseEnter + name MENU_NAME + rect 0 0 640 480 + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + blurWorld 7 + + MENU_ON_OPEN(ON_MENU_OPEN) + MENU_ON_CLOSE(ON_MENU_CLOSE) + MENU_ON_ESC(ON_MENU_ESC) + + #define BACKGROUND_PC_OPTIONS + #define BACKGROUND_IW4 + #define SIDEBAR_RIGHT + #include "ui_mp/bg.inc" + + #include "ui_mp/leftside_options.inc" + + PC_OPTIONS_SECTION_TITLE(MENU_TITLE) + + PC_OPTIONS_DVARENUMLIST(0, "@MENU_VIDEO_MODE", "ui_r_mode", "r_mode", ACTION_SHOW_APPLY, when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby()))) + PC_OPTIONS_DVARYESNO_RAW(1, "@MENU_D3D9EX", "r_useD3D9Ex", ACTION_SHOW_APPLY, "@MPUI_DESC_D3D9EX", when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), 1) + PC_OPTIONS_SEPERATOR(1) + + PC_OPTIONS_DVARYESNO(2, "@MENU_FULLSCREEN", "ui_r_fullscreen", ACTION_SHOW_APPLY exec "vid_xpos 0;vid_ypos 0";, when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby()))) + PC_OPTIONS_DVARYESNO_RAW(3, "@MENU_NOBORDER", "r_noborder", ACTION_SHOW_APPLY exec "vid_xpos 0;vid_ypos 0";, "@MPUI_DESC_NOBORDER", when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), 1) + PC_OPTIONS_DVARYESNO_RAW(4, "@MENU_NATIVECURSOR", "ui_nativeCursor", ;, "@MPUI_DESC_NATIVECURSOR", when(0), 1) + PC_OPTIONS_SEPERATOR(4) + + PC_OPTIONS_DVARSLIDER_RAW(5, "@MENU_BRIGHTNESS", "r_gamma", 0.5, 3, 0.8, setLocalVarBool ui_brightness_hint_display (1);, setLocalVarBool ui_brightness_hint_display (0);, execNow "profile_menuDvarsFinish";, when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), 1, 0) + PC_OPTIONS_FLOATLIST_RAW(6, "@MENU_FOV", "cg_fov", {"65 (Default)" 65 "80" 80 "90" 90 "120" 120}, execNow "profile_menuDvarsFinish";, "@MPUI_DESC_FOV", when(0), 1) + PC_OPTIONS_FLOATLIST_RAW(7, "@MENU_FOVSCALE", "cg_fovscale", {"1 (Default)" 1 "1.1" 1.1 "1.2" 1.2 "1.3" 1.3 "1.4" 1.4 "1.5" 1.5 "1.6" 1.6 "1.7" 1.7 "1.8" 1.8 "1.9" 1.9 "2" 2}, execNow "profile_menuDvarsFinish";, "@MPUI_DESC_FOVSCALE", when(0), 1) + PC_OPTIONS_FLOATLIST_RAW(8, "@MENU_MAXFPS", "com_maxfps", { "30" 30 "85 (Default)" 85 "125" 125 "250" 250 "333" 333 "Unlimited" 0}, ;, "@MPUI_DESC_MAXFPS", when(0), 1) + PC_OPTIONS_SEPERATOR(8) + + itemDef { - play CHOICE_FOCUS_SOUND; - } - onFocus - { - setItemColor self backColor 0 0 0 1; - } - leaveFocus - { - setItemColor self backColor 0 0 0 0; - } - action - { - open "pc_options_advanced_video"; - close self; + rect 260 CHOICE_Y(9) 225 20 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP + style WINDOW_STYLE_FILLED + foreColor CHOICE_TEXTCOLOR + disablecolor 0.6 0.55 0.55 1 + background "menu_setting_selection_bar" + type ITEM_TYPE_BUTTON + textFont UI_FONT_SMALL + textAlign ITEM_ALIGN_TOP_RIGHT + textAlignX -60 + textScale CHOICE_TEXTSIZE + text "@MENU_ADVANCED_VIDEO" + visible 1 + mouseEnter + { + play CHOICE_FOCUS_SOUND; + } + onFocus + { + setItemColor self backColor 0 0 0 1; + } + leaveFocus + { + setItemColor self backColor 0 0 0 0; + } + action + { + open "pc_options_advanced_video"; + close self; + } } } -} \ No newline at end of file +} diff --git a/iw4x/iw4x_00/ui_mp/popup_customclan.menu b/iw4x/iw4x_00/ui_mp/popup_customclan.menu index d65c7f7..9ef1d37 100644 --- a/iw4x/iw4x_00/ui_mp/popup_customclan.menu +++ b/iw4x/iw4x_00/ui_mp/popup_customclan.menu @@ -47,25 +47,27 @@ #define ON_MENU_ESC \ close self; -menuDef { - name MENU_NAME - rect POPMENU_RECT - popup - legacySplitScreenScale - style WINDOW_STYLE_FILLED - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - backColor 1 1 1 1 - background "white" - MENU_ON_OPEN(ON_MENU_OPEN) - MENU_ON_CLOSE(ON_MENU_CLOSE) - MENU_ON_ESC(ON_MENU_ESC) + menuDef + { + name MENU_NAME + rect POPMENU_RECT + popup + legacySplitScreenScale + style WINDOW_STYLE_FILLED + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + backColor 1 1 1 1 + background "white" + MENU_ON_OPEN(ON_MENU_OPEN) + MENU_ON_CLOSE(ON_MENU_CLOSE) + MENU_ON_ESC(ON_MENU_ESC) - POPUP_BACKGROUND_BASE - POPUP_TITLE2(MENU_TITLE) + POPUP_BACKGROUND_BASE + POPUP_TITLE2(MENU_TITLE) - ITEM_NAMEENTRY + ITEM_NAMEENTRY - POPUP_BUTTON_FOOTER(64, "@MENU_CLOSE", close self;) + POPUP_BUTTON_FOOTER(64, "@MENU_CLOSE", close self;) + } } diff --git a/iw4x/iw4x_00/ui_mp/popup_customtitle.menu b/iw4x/iw4x_00/ui_mp/popup_customtitle.menu index b6dff2b..8d3163a 100644 --- a/iw4x/iw4x_00/ui_mp/popup_customtitle.menu +++ b/iw4x/iw4x_00/ui_mp/popup_customtitle.menu @@ -47,25 +47,27 @@ #define ON_MENU_ESC \ close self; -menuDef { - name MENU_NAME - rect POPMENU_RECT - popup - legacySplitScreenScale - style WINDOW_STYLE_FILLED - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - backColor 1 1 1 1 - background "white" - MENU_ON_OPEN(ON_MENU_OPEN) - MENU_ON_CLOSE(ON_MENU_CLOSE) - MENU_ON_ESC(ON_MENU_ESC) + menuDef + { + name MENU_NAME + rect POPMENU_RECT + popup + legacySplitScreenScale + style WINDOW_STYLE_FILLED + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + backColor 1 1 1 1 + background "white" + MENU_ON_OPEN(ON_MENU_OPEN) + MENU_ON_CLOSE(ON_MENU_CLOSE) + MENU_ON_ESC(ON_MENU_ESC) - POPUP_BACKGROUND_BASE - POPUP_TITLE2(MENU_TITLE) + POPUP_BACKGROUND_BASE + POPUP_TITLE2(MENU_TITLE) - ITEM_NAMEENTRY + ITEM_NAMEENTRY - POPUP_BUTTON_FOOTER(64, "@MENU_CLOSE", close self;) + POPUP_BUTTON_FOOTER(64, "@MENU_CLOSE", close self;) + } } diff --git a/iw4x/iw4x_00/ui_mp/popup_friends.menu b/iw4x/iw4x_00/ui_mp/popup_friends.menu index 55344e4..f57bb13 100644 --- a/iw4x/iw4x_00/ui_mp/popup_friends.menu +++ b/iw4x/iw4x_00/ui_mp/popup_friends.menu @@ -26,48 +26,50 @@ #define ON_EXEC_KEY_F \ escape self; -menuDef { - name MENU_NAME - rect POPMENU_RECT - popup - legacySplitScreenScale - style WINDOW_STYLE_FILLED - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - backColor 1 1 1 1 - background "white" - MENU_ON_OPEN(ON_MENU_OPEN) - MENU_ON_CLOSE(ON_MENU_CLOSE) - MENU_ON_ESC(ON_MENU_ESC) - MENU_EXEC_KEY("f", ON_MENU_ESC) - - POPUP_BACKGROUND_BASE - POPUP_TITLE(MENU_TITLE) - - itemDef + menuDef { - name "friendsList" - rect 0 22 POPMENU_WIDTH 326 - type ITEM_TYPE_LISTBOX - style WINDOW_STYLE_FILLED - elementWidth 120 - elementHeight 16 - textFont UI_FONT_NORMAL - foreColor CHOICE_TEXTCOLOR - backColor 0 0 0 0.5 - outlineColor 0 0 0 0.6 - textScale .25 - feeder 61 - visible 1 -// numcols xpos xwidth textlen alignment - columns 3 8 16 4 0 - 42 178 51 0 - 226 263 52 0 - doubleClick + name MENU_NAME + rect POPMENU_RECT + popup + legacySplitScreenScale + style WINDOW_STYLE_FILLED + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + backColor 1 1 1 1 + background "white" + MENU_ON_OPEN(ON_MENU_OPEN) + MENU_ON_CLOSE(ON_MENU_CLOSE) + MENU_ON_ESC(ON_MENU_ESC) + MENU_EXEC_KEY("f", ON_MENU_ESC) + + POPUP_BACKGROUND_BASE + POPUP_TITLE(MENU_TITLE) + + itemDef { - uiScript "JoinFriend"; + name "friendsList" + rect 0 22 POPMENU_WIDTH 326 + type ITEM_TYPE_LISTBOX + style WINDOW_STYLE_FILLED + elementWidth 120 + elementHeight 16 + textFont UI_FONT_NORMAL + foreColor CHOICE_TEXTCOLOR + backColor 0 0 0 0.5 + outlineColor 0 0 0 0.6 + textScale .25 + feeder 61 + visible 1 + // numcols xpos xwidth textlen alignment + columns 3 8 16 4 0 + 42 178 51 0 + 226 263 52 0 + doubleClick + { + uiScript "JoinFriend"; + } } + POPUP_BUTTON_FOOTER(350, "@MENU_CLOSE", close self;) } - POPUP_BUTTON_FOOTER(350, "@MENU_CLOSE", close self;) -} \ No newline at end of file +} diff --git a/iw4x/iw4x_00/ui_mp/popup_joinpassword.menu b/iw4x/iw4x_00/ui_mp/popup_joinpassword.menu index cc3487f..4d53b35 100644 --- a/iw4x/iw4x_00/ui_mp/popup_joinpassword.menu +++ b/iw4x/iw4x_00/ui_mp/popup_joinpassword.menu @@ -47,25 +47,28 @@ #define ON_MENU_ESC \ close self; -menuDef + { - name MENU_NAME - rect POPMENU_RECT - popup - legacySplitScreenScale - style WINDOW_STYLE_FILLED - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - backColor 1 1 1 1 - background "white" - MENU_ON_OPEN(ON_MENU_OPEN) - MENU_ON_CLOSE(ON_MENU_CLOSE) - MENU_ON_ESC(ON_MENU_ESC) + menuDef + { + name MENU_NAME + rect POPMENU_RECT + popup + legacySplitScreenScale + style WINDOW_STYLE_FILLED + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + backColor 1 1 1 1 + background "white" + MENU_ON_OPEN(ON_MENU_OPEN) + MENU_ON_CLOSE(ON_MENU_CLOSE) + MENU_ON_ESC(ON_MENU_ESC) - POPUP_BACKGROUND_BASE - POPUP_TITLE2(MENU_TITLE) + POPUP_BACKGROUND_BASE + POPUP_TITLE2(MENU_TITLE) - ITEM_PASSWORDENTRY + ITEM_PASSWORDENTRY - POPUP_BUTTON_FOOTER(64, "@MENU_OK", close self;) -} + POPUP_BUTTON_FOOTER(64, "@MENU_OK", close self;) + } +} \ No newline at end of file diff --git a/iw4x/iw4x_00/ui_mp/popup_playername.menu b/iw4x/iw4x_00/ui_mp/popup_playername.menu index dd7ae05..304be93 100644 --- a/iw4x/iw4x_00/ui_mp/popup_playername.menu +++ b/iw4x/iw4x_00/ui_mp/popup_playername.menu @@ -49,25 +49,27 @@ #define ON_MENU_ESC \ close self; -menuDef { - name MENU_NAME - rect POPMENU_RECT - popup - legacySplitScreenScale - style WINDOW_STYLE_FILLED - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - backColor 1 1 1 1 - background "white" - MENU_ON_OPEN(ON_MENU_OPEN) - MENU_ON_CLOSE(ON_MENU_CLOSE) - MENU_ON_ESC(ON_MENU_ESC) + menuDef + { + name MENU_NAME + rect POPMENU_RECT + popup + legacySplitScreenScale + style WINDOW_STYLE_FILLED + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + backColor 1 1 1 1 + background "white" + MENU_ON_OPEN(ON_MENU_OPEN) + MENU_ON_CLOSE(ON_MENU_CLOSE) + MENU_ON_ESC(ON_MENU_ESC) - POPUP_BACKGROUND_BASE - POPUP_TITLE2(MENU_TITLE) + POPUP_BACKGROUND_BASE + POPUP_TITLE2(MENU_TITLE) - ITEM_NAMEENTRY + ITEM_NAMEENTRY - POPUP_BUTTON_FOOTER(64, "@MENU_CLOSE", exec "setfromdvar name ui_name"; close self;) -} + POPUP_BUTTON_FOOTER(64, "@MENU_CLOSE", exec "setfromdvar name ui_name"; close self;) + } +} \ No newline at end of file diff --git a/iw4x/iw4x_00/ui_mp/popup_serverpassword.menu b/iw4x/iw4x_00/ui_mp/popup_serverpassword.menu index 399e68c..513f400 100644 --- a/iw4x/iw4x_00/ui_mp/popup_serverpassword.menu +++ b/iw4x/iw4x_00/ui_mp/popup_serverpassword.menu @@ -49,25 +49,27 @@ #define ON_MENU_ESC \ close self; -menuDef { - name MENU_NAME - rect POPMENU_RECT - popup - legacySplitScreenScale - style WINDOW_STYLE_FILLED - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - backColor 1 1 1 1 - background "white" - MENU_ON_OPEN(ON_MENU_OPEN) - MENU_ON_CLOSE(ON_MENU_CLOSE) - MENU_ON_ESC(ON_MENU_ESC) + menuDef + { + name MENU_NAME + rect POPMENU_RECT + popup + legacySplitScreenScale + style WINDOW_STYLE_FILLED + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + backColor 1 1 1 1 + background "white" + MENU_ON_OPEN(ON_MENU_OPEN) + MENU_ON_CLOSE(ON_MENU_CLOSE) + MENU_ON_ESC(ON_MENU_ESC) - POPUP_BACKGROUND_BASE - POPUP_TITLE2(MENU_TITLE) + POPUP_BACKGROUND_BASE + POPUP_TITLE2(MENU_TITLE) - ITEM_PASSWORDENTRY + ITEM_PASSWORDENTRY - POPUP_BUTTON_FOOTER(64, "@MENU_OK", close self;) + POPUP_BUTTON_FOOTER(64, "@MENU_OK", close self;) + } } diff --git a/iw4x/iw4x_00/ui_mp/scriptmenus/changegametype.menu b/iw4x/iw4x_00/ui_mp/scriptmenus/changegametype.menu index 0dc1cc7..9cc092b 100644 --- a/iw4x/iw4x_00/ui_mp/scriptmenus/changegametype.menu +++ b/iw4x/iw4x_00/ui_mp/scriptmenus/changegametype.menu @@ -81,7 +81,7 @@ elementtype LISTBOX_TEXT elementwidth 120 elementheight 24 - columns 1 2 190 25 + columns 1 2 190 25 0 mouseEnter { setitemcolor "maplist2"; diff --git a/iw4x/iw4x_00/ui_mp/scriptmenus/changemap.menu b/iw4x/iw4x_00/ui_mp/scriptmenus/changemap.menu index eb72530..1d84f0e 100644 --- a/iw4x/iw4x_00/ui_mp/scriptmenus/changemap.menu +++ b/iw4x/iw4x_00/ui_mp/scriptmenus/changemap.menu @@ -83,7 +83,7 @@ bordercolor 1 1 1 0.15 outlinecolor 1 1 1 0.2 feeder FEEDER_ALLMAPS - columns 1 2 190 25 + columns 1 2 190 25 0 mouseEnter { setitemcolor "maplist"; diff --git a/iw4x/iw4x_00/ui_mp/scriptmenus/kickplayer.menu b/iw4x/iw4x_00/ui_mp/scriptmenus/kickplayer.menu index 1507bb0..3773958 100644 --- a/iw4x/iw4x_00/ui_mp/scriptmenus/kickplayer.menu +++ b/iw4x/iw4x_00/ui_mp/scriptmenus/kickplayer.menu @@ -80,7 +80,7 @@ bordercolor 1 1 1 0.15 outlinecolor 1 1 1 0.2 feeder FEEDER_PLAYER_LIST - columns 1 2 190 25 + columns 1 2 190 25 0 mouseEnter { setitemcolor "maplist"; diff --git a/iw4x/iw4x_00/ui_mp/serverinfo_popmenu.menu b/iw4x/iw4x_00/ui_mp/serverinfo_popmenu.menu index 73be742..4c81481 100644 --- a/iw4x/iw4x_00/ui_mp/serverinfo_popmenu.menu +++ b/iw4x/iw4x_00/ui_mp/serverinfo_popmenu.menu @@ -109,58 +109,6 @@ #define SV_INFO_TABLE_WIDTH 496 #define SV_INFO_TABLE_HEIGHT 160 -#define SV_INFO_TABLE_HEADER \ - itemDef \ - { \ - name "num" \ - rect (SV_INFO_TABLE_POS_X + 4) (SV_INFO_TABLE_POS_Y - 2) 30 18 0 0 \ - foreColor CHOICE_TEXTCOLOR \ - textFont UI_FONT_NORMAL \ - textScale 0.3 \ - textAlignX 4 \ - decoration \ - visible 1 \ - text "#" \ - } \ - itemDef \ - { \ - name "name" \ - rect 88 (SV_INFO_TABLE_POS_Y - 2) 30 18 0 0 \ - foreColor CHOICE_TEXTCOLOR \ - textFont UI_FONT_NORMAL \ - textScale 0.3 \ - textAlignX 4 \ - decoration \ - visible 1 \ - text "@MENU_NAME" \ - } \ - itemDef \ - { \ - name "score" \ - rect 353 (SV_INFO_TABLE_POS_Y - 2) 30 18 0 0 \ - foreColor CHOICE_TEXTCOLOR \ - textFont UI_FONT_NORMAL \ - textScale 0.3 \ - textAlignX 4 \ - decoration \ - visible 1 \ - text "@MPUI_SCORE" \ - } \ - itemDef \ - { \ - name "ping" \ - rect 455 (SV_INFO_TABLE_POS_Y - 2) 30 18 0 0 \ - foreColor CHOICE_TEXTCOLOR \ - textFont UI_FONT_NORMAL \ - textScale 0.3 \ - textAlignX 4 \ - decoration \ - visible 1 \ - text "@MENU_PING" \ - } - -#define MENU_NAME "serverinfo_popmenu" - #define KEYINT_F5 171 #define POPMENU_POS_X -250 @@ -184,63 +132,111 @@ #define ON_KEY_PRESS_F5 \ uiScript "ServerStatus"; -menuDef { - name MENU_NAME - rect POPMENU_RECT - popup - legacySplitScreenScale - style WINDOW_STYLE_FILLED - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - backColor 1 1 1 1 - background "white" - MENU_ON_OPEN(ON_MENU_OPEN) - MENU_ON_CLOSE(ON_MENU_CLOSE) - MENU_ON_ESC(ON_MENU_ESC) - MENU_EXEC_KEYINT(KEYINT_F5, ON_KEY_PRESS_F5) - - POPUP_BACKGROUND_BASE - POPUP_TITLE(dvarString("uiSi_ServerName")) - - SV_INFO_FIELD(1, "@MPUI_MAX_CLIENTS", dvarString("uiSi_MaxClients")) - SV_INFO_FIELD(2, "@MPUI_IS_PRIVATE", dvarString("uiSi_isPrivate")) - SV_INFO_FIELD(3, "@MPUI_RULES_HARDCORE", dvarString("uiSi_Hardcore")) - SV_INFO_FIELD(4, "@MPUI_RULES_AIMASSIST", dvarString("uiSi_aimAssist")) - SV_INFO_FIELD(5, "@MPUI_RULES_VOICECHAT", dvarString("uiSi_voiceChat")) - SV_INFO_FIELD(6, "@MPUI_MOD", dvarString("uiSi_ModName")) - - SV_INFO_MAP_PREVIEW_VIS(("loadscreen_mp_bonusmaps"), when(dvarString("uiSi_MapName") == "")) - SV_INFO_MAP_PREVIEW_VIS(("preview_" + dvarString("uiSi_MapName")), when(dvarString("uiSi_MapName") != "")) - - SV_INFO_SECURITY_LEVEL_VIS(6, 1) - - SV_INFO_TABLE_HEADER - - itemDef + menuDef { - rect SV_INFO_TABLE_POS_X SV_INFO_TABLE_POS_Y SV_INFO_TABLE_WIDTH SV_INFO_TABLE_HEIGHT - type ITEM_TYPE_LISTBOX - style WINDOW_STYLE_FILLED - foreColor CHOICE_TEXTCOLOR - backColor 0 0 0 0.5 - textFont UI_FONT_NORMAL - textScale .25 - border 1 - borderSize 1 - borderColor 1 1 1 0.1 - feeder FEEDER_SERVERSTATUS - elementWidth 120 - elementHeight 16 - notselectable - visible 1 -// numcols xpos xwidth textlen alignment - columns 4 8 2 2 0 - 80 16 16 0 - 345 4 4 0 - 447 4 4 0 - } + name "serverinfo_popmenu" + rect POPMENU_RECT + popup + legacySplitScreenScale + style WINDOW_STYLE_FILLED + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + backColor 1 1 1 1 + background "white" + MENU_ON_OPEN(ON_MENU_OPEN) + MENU_ON_CLOSE(ON_MENU_CLOSE) + MENU_ON_ESC(ON_MENU_ESC) + MENU_EXEC_KEYINT(KEYINT_F5, ON_KEY_PRESS_F5) - POPUP_BUTTON_FOOTER(330, "@PLATFORM_REFRESH", uiScript "ServerStatus";) - POPUP_BUTTON_FOOTER(350, "@MENU_CLOSE", close self;) -} + POPUP_BACKGROUND_BASE + POPUP_TITLE(dvarString("uiSi_ServerName")) + + SV_INFO_FIELD(1, "@MPUI_MAX_CLIENTS", dvarString("uiSi_MaxClients")) + SV_INFO_FIELD(2, "@MPUI_IS_PRIVATE", dvarString("uiSi_isPrivate")) + SV_INFO_FIELD(3, "@MPUI_RULES_HARDCORE", dvarString("uiSi_Hardcore")) + SV_INFO_FIELD(4, "@MPUI_RULES_AIMASSIST", dvarString("uiSi_aimAssist")) + SV_INFO_FIELD(5, "@MPUI_RULES_VOICECHAT", dvarString("uiSi_voiceChat")) + SV_INFO_FIELD(6, "@MPUI_MOD", dvarString("uiSi_ModName")) + + SV_INFO_MAP_PREVIEW_VIS(("loadscreen_mp_bonusmaps"), when(dvarString("uiSi_MapName") == "")) + SV_INFO_MAP_PREVIEW_VIS(("preview_" + dvarString("uiSi_MapName")), when(dvarString("uiSi_MapName") != "")) + + SV_INFO_SECURITY_LEVEL_VIS(6, 1) + + itemDef + { + name "num" + rect (SV_INFO_TABLE_POS_X + 4) (SV_INFO_TABLE_POS_Y - 2) 30 18 0 0 + foreColor CHOICE_TEXTCOLOR + textFont UI_FONT_NORMAL + textScale 0.3 + textAlignX 4 + visible 1 + text "#" + } + + itemDef + { + name "name" + rect 88 (SV_INFO_TABLE_POS_Y - 2) 30 18 0 0 + foreColor CHOICE_TEXTCOLOR + textFont UI_FONT_NORMAL + textScale 0.3 + textAlignX 4 + visible 1 + text "@MENU_NAME" + } + + itemDef + { + name "score" + rect 353 (SV_INFO_TABLE_POS_Y - 2) 30 18 0 0 + foreColor CHOICE_TEXTCOLOR + textFont UI_FONT_NORMAL + textScale 0.3 + textAlignX 4 + visible 1 + text "@MPUI_SCORE" + } + + itemDef + { + name "ping" + rect 455 (SV_INFO_TABLE_POS_Y - 2) 30 18 0 0 + foreColor CHOICE_TEXTCOLOR + textFont UI_FONT_NORMAL + textScale 0.3 + textAlignX 4 + visible 1 + text "@MENU_PING" + } + + itemDef + { + rect SV_INFO_TABLE_POS_X SV_INFO_TABLE_POS_Y SV_INFO_TABLE_WIDTH SV_INFO_TABLE_HEIGHT + type ITEM_TYPE_LISTBOX + style WINDOW_STYLE_FILLED + foreColor CHOICE_TEXTCOLOR + backColor 0 0 0 0.5 + textFont UI_FONT_NORMAL + textScale .25 + border 1 + borderSize 1 + borderColor 1 1 1 0.1 + feeder FEEDER_SERVERSTATUS + elementWidth 120 + elementHeight 16 + notselectable + visible 1 + // numcols xpos xwidth textlen alignment + columns 4 8 2 2 0 + 80 16 16 0 + 345 4 4 0 + 447 4 4 0 + } + + POPUP_BUTTON_FOOTER(330, "@PLATFORM_REFRESH", uiScript "ServerStatus";) + POPUP_BUTTON_FOOTER(350, "@MENU_CLOSE", close self;) + } +} \ No newline at end of file diff --git a/iw4x/iw4x_00/ui_mp/settings_gametype.menu b/iw4x/iw4x_00/ui_mp/settings_gametype.menu index 4cf268a..37421a4 100644 --- a/iw4x/iw4x_00/ui_mp/settings_gametype.menu +++ b/iw4x/iw4x_00/ui_mp/settings_gametype.menu @@ -56,7 +56,6 @@ textScale 0.55 textStyle 0 textFont 0 - feeder 0 visible 1 } itemDef @@ -81,7 +80,6 @@ textScale 0.55 textStyle 0 textFont 0 - feeder 0 visible 1 exp rect x ( ( 0 - 107 ) - ( ( float( milliseconds( ) % 60000 ) / 60000 ) * ( 854 ) ) ) } @@ -107,7 +105,6 @@ textScale 0.55 textStyle 0 textFont 0 - feeder 0 visible 1 exp rect x ( ( - 107 + 854 ) + ( ( float( milliseconds( ) % 50000 ) / 50000 ) * ( 854 ) ) ) } @@ -133,9 +130,8 @@ textScale 0.55 textStyle 0 textFont 0 - feeder 0 visible 1 - exp forecolor a ( ( ( ( sin milliseconds( ) / 1500 ) + 1 ) * 0.250000 ) + 0.250000 ) + exp forecolor a ( ( ( ( sin milliseconds( ) / 1500 ) + 1 ) * 0.250000 ) + 0.250000 ) } itemDef { @@ -159,7 +155,6 @@ textScale 0.55 textStyle 0 textFont 0 - feeder 0 visible 1 exp forecolor a ( ( ( ( sin milliseconds( ) / 480 ) + 1 ) * 0.250000 ) + 0.250000 ) } @@ -184,7 +179,6 @@ textScale 0.44 textStyle 0 textFont 9 - feeder 0 text "@MENU_CHOOSE_GAME_MODE_CAP" visible 1 } @@ -210,7 +204,6 @@ textScale 0.55 textStyle 0 textFont 0 - feeder 0 visible 1 } itemDef @@ -235,7 +228,6 @@ textScale 0.55 textStyle 0 textFont 0 - feeder 0 visible 1 } itemDef @@ -260,7 +252,6 @@ textScale 0.55 textStyle 0 textFont 0 - feeder 0 visible 1 } itemDef @@ -285,7 +276,6 @@ textScale 0.55 textStyle 0 textFont 0 - feeder 0 visible 1 } itemDef @@ -310,7 +300,6 @@ textScale 0.55 textStyle 0 textFont 0 - feeder 0 visible 1 } itemDef @@ -335,7 +324,6 @@ textScale 0.55 textStyle 0 textFont 0 - feeder 0 visible 1 } itemDef @@ -360,7 +348,6 @@ textScale 0.55 textStyle 0 textFont 0 - feeder 0 visible 1 } itemDef @@ -385,7 +372,6 @@ textScale 0.55 textStyle 0 textFont 0 - feeder 0 visible 1 } itemDef @@ -410,7 +396,6 @@ textScale 0.55 textStyle 0 textFont 0 - feeder 0 visible 1 } @@ -445,7 +430,6 @@ textScale 0.375 \ textStyle 0 \ textFont 3 \ - feeder 0 \ visible 1 \ visible visArg \ exp text ( "@" + tablelookup( "mp/gameTypesTable.csv" , 0 , textArg , 1 ) + "_CAPS" ) \ @@ -502,7 +486,6 @@ textStyle 0 \ textFont 3 \ text textArg \ - feeder 0 \ visible 1 \ visible visArg \ onFocus \ @@ -614,7 +597,6 @@ textScale 0.375 textStyle 0 textFont 3 - feeder 0 text "@PLATFORM_BACK_CAPS" visible 1 onFocus @@ -656,7 +638,6 @@ textScale 0.55 textStyle 0 textFont 0 - feeder 0 visible 1 } itemDef @@ -680,7 +661,6 @@ textScale 0.375 textStyle 0 textFont 9 - feeder 0 visible 1 exp text ( localvarstring( "ui_info_name" ) ) } @@ -706,7 +686,6 @@ textScale 0.375 textStyle 0 textFont 3 - feeder 0 visible 1 exp text ( localvarstring( "ui_info_desc" ) ) } diff --git a/iw4x/iw4x_00/ui_mp/theater_menu.menu b/iw4x/iw4x_00/ui_mp/theater_menu.menu index bbeacd9..ff91391 100644 --- a/iw4x/iw4x_00/ui_mp/theater_menu.menu +++ b/iw4x/iw4x_00/ui_mp/theater_menu.menu @@ -211,55 +211,57 @@ #define ON_MENU_ESC \ close self; -menuDef { - name MENU_NAME - fullscreen 1 - rect 0 0 640 480 - foreColor CHOICE_TEXTCOLOR - focusColor CHOICE_TEXTCOLOR - soundLoop MENU_MUSIC - fadeCycle 1 - fadeClamp 1 - fadeAmount 0.1 - - MENU_ON_OPEN(ON_MENU_OPEN) - MENU_ON_ESC(ON_MENU_ESC) - - #define DISABLE_SIDEBAR - #include "ui_mp/bg.inc" - - MENU_ITEM_TITLE(-90) - MENU_BACKGROUND_FRAME - MENU_BACKGROUND_PANEL_RIGHT - - itemDef + menuDef { - name "demoList" - rect 0 28 260 356 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP - style WINDOW_STYLE_FILLED - foreColor CHOICE_TEXTCOLOR - backColor 0 0 0 0.5 - outLineColor 0 0 0 0.6 - type ITEM_TYPE_LISTBOX - textFont UI_FONT_NORMAL - textAlignX 6 - textScale 0.3 - visible 1 - feeder FEEDER_DEMOS - elementWidth 260 - elementHeight 16 -// numcols xpos xwidth textlen alignment - columns 1 8 260 80 0 - doubleClick - { - uiScript "launchDemo"; - } - execKeyInt 13 - { - uiScript "launchDemo"; - } - } + name MENU_NAME + fullscreen 1 + rect 0 0 640 480 + foreColor CHOICE_TEXTCOLOR + focusColor CHOICE_TEXTCOLOR + soundLoop MENU_MUSIC + fadeCycle 1 + fadeClamp 1 + fadeAmount 0.1 - ITEM_BUTTON_BACK(close self;) -} \ No newline at end of file + MENU_ON_OPEN(ON_MENU_OPEN) + MENU_ON_ESC(ON_MENU_ESC) + + #define DISABLE_SIDEBAR + #include "ui_mp/bg.inc" + + MENU_ITEM_TITLE(-90) + MENU_BACKGROUND_FRAME + MENU_BACKGROUND_PANEL_RIGHT + + itemDef + { + name "demoList" + rect 0 28 260 356 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP + style WINDOW_STYLE_FILLED + foreColor CHOICE_TEXTCOLOR + backColor 0 0 0 0.5 + outLineColor 0 0 0 0.6 + type ITEM_TYPE_LISTBOX + textFont UI_FONT_NORMAL + textAlignX 6 + textScale 0.3 + visible 1 + feeder FEEDER_DEMOS + elementWidth 260 + elementHeight 16 + // numcols xpos xwidth textlen alignment + columns 1 8 260 80 0 + doubleClick + { + uiScript "launchDemo"; + } + execKeyInt 13 + { + uiScript "launchDemo"; + } + } + + ITEM_BUTTON_BACK(close self;) + } +}