From 531002020a95950e8ae33d37fdb5cf18f7ec7821 Mon Sep 17 00:00:00 2001 From: JerryALT Date: Fri, 29 Mar 2024 19:59:22 +0300 Subject: [PATCH] [Mod FF]: Updated the menu files. --- iw3sp_mod_ff_src/raw/ui/briefing.menu | 25 +- .../raw/ui/choices_setup_common.menu | 112 +++++- .../raw/ui/controls_buttons_set.inc | 337 +++++++++--------- iw3sp_mod_ff_src/raw/ui/exec.menu | 119 +++++++ iw3sp_mod_ff_src/raw/ui/hud.menu | 4 +- .../raw/ui/iw3sp_mod_settings_restart.menu | 37 ++ iw3sp_mod_ff_src/raw/ui/levels.menu | 46 ++- iw3sp_mod_ff_src/raw/ui/main.menu | 34 +- iw3sp_mod_ff_src/raw/ui/menudefinition.h | 7 +- iw3sp_mod_ff_src/raw/ui/menus.txt | 2 + iw3sp_mod_ff_src/raw/ui/options_game_pc.menu | 3 +- .../raw/ui/options_graphics_pc.menu | 1 + .../raw/ui/options_iw3sp_mod.menu | 50 +++ iw3sp_mod_ff_src/raw/ui/pregame.menu | 24 +- iw3sp_mod_ff_src/raw/ui_mp/navcontrols.inc | 197 ++++++---- 15 files changed, 718 insertions(+), 280 deletions(-) create mode 100644 iw3sp_mod_ff_src/raw/ui/exec.menu create mode 100644 iw3sp_mod_ff_src/raw/ui/iw3sp_mod_settings_restart.menu diff --git a/iw3sp_mod_ff_src/raw/ui/briefing.menu b/iw3sp_mod_ff_src/raw/ui/briefing.menu index 8408de4..d573f2e 100644 --- a/iw3sp_mod_ff_src/raw/ui/briefing.menu +++ b/iw3sp_mod_ff_src/raw/ui/briefing.menu @@ -27,20 +27,31 @@ itemDef { type ITEM_TYPE_TEXT - #ifdef PC - rect -250 388 500 0 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_TOP - #else - rect -225 352 450 0 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_TOP - #endif + rect -250 388 500 0 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_TOP textcinematicsubtitle textfont UI_FONT_DEFAULT textstyle ITEM_TEXTSTYLE_SHADOWED textscale 0.38 textalign ITEM_ALIGN_TOP_CENTER - visible 1 + visible when( dvarBool(console_menu_style) == 0 ) decoration autowrapped - } + } + + itemDef + { + type ITEM_TYPE_TEXT + rect -225 352 450 0 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_TOP + textcinematicsubtitle + textfont UI_FONT_DEFAULT + textstyle ITEM_TEXTSTYLE_SHADOWED + textscale 0.38 + textalign ITEM_ALIGN_TOP_CENTER + visible when( dvarBool(console_menu_style) == 1 ) + decoration + autowrapped + } + /* itemDef { diff --git a/iw3sp_mod_ff_src/raw/ui/choices_setup_common.menu b/iw3sp_mod_ff_src/raw/ui/choices_setup_common.menu index 52330d1..e270df9 100644 --- a/iw3sp_mod_ff_src/raw/ui/choices_setup_common.menu +++ b/iw3sp_mod_ff_src/raw/ui/choices_setup_common.menu @@ -256,6 +256,9 @@ #define CHOICE_HIGHLIGHT( itemIndex, vis ) \ CHOICE_HIGHLIGHT_CUSTOM( itemIndex, HIGHLIGHT_COLOR, HIGHLIGHT_BORDER_COLOR, vis ) +#define CHOICE_HIGHLIGHT_ADV( itemIndex, vis ) \ + CHOICE_HIGHLIGHT_CUSTOM_ADV( itemIndex, HIGHLIGHT_COLOR, HIGHLIGHT_BORDER_COLOR, vis ) + #define UI_EDGE( porigin, palign, poffset_x, poffset_y, pcolor ) UI_EDGE_RAW( porigin, palign, 5, 20, poffset_x, poffset_y, pcolor ) #define UI_EDGE_REVERSE( porigin, palign, poffset_x, poffset_y, pcolor ) UI_EDGE_RAW( porigin, palign, -5, 20, poffset_x, poffset_y, pcolor ) @@ -318,6 +321,30 @@ } \ CHOICE_ACCEPT_HINT( itemIndex, visArg ) +#define CHOICE_HIGHLIGHT_CUSTOM_ADV( itemIndex, foreColorArg, borderColorArg, vis ) \ + itemDef \ + { \ + style WINDOW_STYLE_SHADER \ + rect CHOICE_ORIGIN( itemIndex ) (CHOICE_SIZE_X-(CHOICE_SIZE_Y/4)) CHOICE_SIZE_Y CHOICE_HORIZONTAL_ALIGN CHOICE_VERTICAL_ALIGN \ + background HIGHLIGHT_SHADER \ + forecolor foreColorArg \ + border HIGHLIGHT_BORDER \ + bordersize 2 \ + bordercolor borderColorArg \ + visible when( localVarInt( ui_highlight ) == itemIndex && localVarString( ui_choicegroup ) == CHOICE_GROUP ); \ + decoration \ + } \ + itemDef \ + { \ + style WINDOW_STYLE_SHADER \ + rect (CHOICE_X( itemIndex )+(CHOICE_SIZE_X-(CHOICE_SIZE_Y/4))) CHOICE_Y( itemIndex ) (CHOICE_SIZE_Y/4) CHOICE_SIZE_Y CHOICE_HORIZONTAL_ALIGN CHOICE_VERTICAL_ALIGN \ + background HIGHLIGHT_SHADER_ART \ + forecolor foreColorArg \ + visible when( localVarInt( ui_highlight ) == itemIndex && localVarString( ui_choicegroup ) == CHOICE_GROUP ); \ + decoration \ + } \ + CHOICE_ACCEPT_HINT_NEW( itemIndex, vis ) + // used for custom highlights for itemDefs that are special and can not use itemIndex or complie with the strict alignment of this macro set #define CHOICE_HIGHLIGHT_CUSTOM_2( px, py, pw, ph, visArg ) \ itemDef \ @@ -360,27 +387,70 @@ //CHOICE_TEXT_OFFSET_X -#if defined( CONSOLE ) && !defined( SPLITSCREEN ) #define CHOICE_ACCEPT_HINT( itemIndex, vis ) \ itemDef \ { \ rect CHOICE_RECT( itemIndex ) \ origin A_BUTTON_OFFSET_X A_BUTTON_OFFSET_Y \ - text "@PLATFORM_UI_SELECTBUTTON" \ + text "@IW3SP_MOD_LOC_PLATFORM_UI_SELECTBUTTON_XBOX" \ textfont A_BUTTON_FONT \ textscale A_BUTTON_SIZE \ textstyle A_BUTTON_TEXTSTYLE \ textAlign CHOICE_TEXTALIGN \ textAlignX 0\ - textAlignY -1\ + textAlignY 0\ forecolor 1 1 1 1 \ - visible when( localVarInt( ui_highlight ) == itemIndex && localVarString( ui_choicegroup ) == CHOICE_GROUP && vis ); \ + visible when( localVarInt( ui_highlight ) == itemIndex && localVarString( ui_choicegroup ) == CHOICE_GROUP && dvarBool( gpad_in_use ) == 1 && dvarBool( gpad_style ) == 0 ); \ decoration \ - } -#else // #if defined( CONSOLE ) && !defined( SPLITSCREEN ) -#define CHOICE_ACCEPT_HINT( itemIndex, vis ) -#endif // #else // #if defined( CONSOLE ) && !defined( SPLITSCREEN ) - + } \ + itemDef \ + { \ + rect CHOICE_RECT( itemIndex ) \ + origin A_BUTTON_OFFSET_X A_BUTTON_OFFSET_Y \ + text "@IW3SP_MOD_LOC_PLATFORM_UI_SELECTBUTTON_SONY" \ + textfont A_BUTTON_FONT \ + textscale A_BUTTON_SIZE \ + textstyle A_BUTTON_TEXTSTYLE \ + textAlign CHOICE_TEXTALIGN \ + textAlignX 0\ + textAlignY 0\ + forecolor 1 1 1 1 \ + visible when( localVarInt( ui_highlight ) == itemIndex && localVarString( ui_choicegroup ) == CHOICE_GROUP && dvarBool( gpad_in_use ) == 1 && dvarBool( gpad_style ) == 1 ); \ + decoration \ + } + +#define CHOICE_ACCEPT_HINT_NEW( itemIndex, vis ) \ + itemDef \ + { \ + rect CHOICE_RECT( itemIndex ) \ + origin A_BUTTON_OFFSET_X A_BUTTON_OFFSET_Y \ + text "@IW3SP_MOD_LOC_PLATFORM_UI_SELECTBUTTON_XBOX" \ + textfont A_BUTTON_FONT \ + textscale A_BUTTON_SIZE \ + textstyle A_BUTTON_TEXTSTYLE \ + textAlign CHOICE_TEXTALIGN \ + textAlignX 0\ + textAlignY 0\ + forecolor 1 1 1 1 \ + visible when( localVarInt( ui_highlight ) == itemIndex && localVarString( ui_choicegroup ) == CHOICE_GROUP && dvarBool( gpad_in_use ) == 1 && dvarBool( gpad_style ) == 0 && vis); \ + decoration \ + } \ + itemDef \ + { \ + rect CHOICE_RECT( itemIndex ) \ + origin A_BUTTON_OFFSET_X A_BUTTON_OFFSET_Y \ + text "@IW3SP_MOD_LOC_PLATFORM_UI_SELECTBUTTON_SONY" \ + textfont A_BUTTON_FONT \ + textscale A_BUTTON_SIZE \ + textstyle A_BUTTON_TEXTSTYLE \ + textAlign CHOICE_TEXTALIGN \ + textAlignX 0\ + textAlignY 0\ + forecolor 1 1 1 1 \ + visible when( localVarInt( ui_highlight ) == itemIndex && localVarString( ui_choicegroup ) == CHOICE_GROUP && dvarBool( gpad_in_use ) == 1 && dvarBool( gpad_style ) == 1 && vis); \ + decoration \ + } + #define CHOICE_MENU_TITLE_SS( titleArg ) \ itemDef \ { \ @@ -410,7 +480,20 @@ textalign ITEM_ALIGN_TOP_LEFT \ textaligny TITLE_Y_OFFSET \ textalignx TITLE_X_OFFSET \ - visible 1 \ + visible when( dvarBool(console_menu_style) == 0 ) \ + decoration \ + } \ + itemDef \ + { \ + type ITEM_TYPE_TEXT \ + origin ORIGIN_TITLE \ + forecolor COLOR_TITLE \ + exp text( titleArg ) \ + textfont UI_FONT_NORMAL \ + textscale TEXTSIZE_TITLE \ + textstyle CHOICE_TEXTSTYLE \ + textalign ITEM_ALIGN_TOP_LEFT \ + visible when( dvarBool(console_menu_style) == 1 ) \ decoration \ } @@ -531,6 +614,11 @@ CHOICE_HIGHLIGHT( itemIndex, vis ) \ CHOICE_BUTTON_FOCUS_VIS_NOHI( itemIndex, textArg, actionArg, onFocusArg, leaveFocusArg, visArg ) +#define CHOICE_BUTTON_FOCUS_VIS_ADV_NO_HINT( itemIndex, textArg, actionArg, onFocusArg, leaveFocusArg, visArg, vis ) \ + CHOICE_BUTTON_BG( itemIndex, visArg ) \ + CHOICE_HIGHLIGHT_ADV( itemIndex, vis ) \ + CHOICE_BUTTON_FOCUS_VIS_NOHI( itemIndex, textArg, actionArg, onFocusArg, leaveFocusArg, visArg ) + #define CHOICE_BUTTON_FOCUS_VIS_NOHI( itemIndex, textArg, actionArg, onFocusArg, leaveFocusArg, visArg ) \ CHOICE_BUTTON_FOCUS_VIS_NOHI_EX( itemIndex, textArg, actionArg, onFocusArg, leaveFocusArg, visArg, ; ) @@ -575,6 +663,7 @@ #define CHOICE_DBUTTON_VIS_NOHI( itemIndex, textArg, visArg ) \ itemDef \ { \ + name "DisabledButton" \ type ITEM_TYPE_TEXT \ rect CHOICE_RECT( itemIndex ) \ exp text( textArg ); \ @@ -592,6 +681,7 @@ CHOICE_BUTTON_BG( itemIndex, visArg ) \ itemDef \ { \ + name "DisabledButton" \ type ITEM_TYPE_TEXT \ rect CHOICE_RECT( itemIndex ) \ exp text( textArg ); \ @@ -914,7 +1004,7 @@ { \ play CHOICE_FOCUS_SOUND; \ setLocalVarInt ui_highlight itemIndex; \ - setLocalVarString ui_choicegroup CHOICE_GROUP; \ + setLocalVarString ui_choicegroup CHOICE_GROUP; \ onFocusArg \ } \ leaveFocus \ diff --git a/iw3sp_mod_ff_src/raw/ui/controls_buttons_set.inc b/iw3sp_mod_ff_src/raw/ui/controls_buttons_set.inc index d08a144..8e5bd9a 100644 --- a/iw3sp_mod_ff_src/raw/ui/controls_buttons_set.inc +++ b/iw3sp_mod_ff_src/raw/ui/controls_buttons_set.inc @@ -112,6 +112,19 @@ decoration \ } +#define CONTROLS_BUTTON_TEST(visArg) \ + itemDef \ + { \ + type ITEM_TYPE_TEXT \ + origin BUTTON_ORIGIN \ + forecolor 1 1 1 1 \ + textstyle ITEM_TEXTSTYLE_SHADOWED \ + textscale FONTSCALE_SMALL \ + ownerdraw UI_GPAD_BUTTONS_SCHEME \ + visible when (visArg) \ + decoration \ + } + itemDef { style WINDOW_STYLE_SHADER @@ -156,164 +169,168 @@ itemDef decoration } -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX || HAS_TACTICAL_BUTTONS_XBOX || HAS_LEFTY_BUTTONS_XBOX || -HAS_DEFAULT_ALT_BUTTONS_XBOX || HAS_TACTICAL_ALT_BUTTONS_XBOX || HAS_LEFTY_ALT_BUTTONS_XBOX , SET1_BUTTONA_TEXT, BUTTON_TEXTOFFSET_A, ITEM_ALIGN_TOP_LEFT ) +CONTROLS_BUTTON_TEST(HAS_SELECTED_BUTTONS) -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX || HAS_TACTICAL_BUTTONS_XBOX || HAS_LEFTY_BUTTONS_XBOX || -HAS_DEFAULT_ALT_BUTTONS_XBOX || HAS_TACTICAL_ALT_BUTTONS_XBOX || HAS_LEFTY_ALT_BUTTONS_XBOX , SET1_BUTTONX_TEXT, BUTTON_TEXTOFFSET_X, ITEM_ALIGN_TOP_LEFT ) - -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX || HAS_TACTICAL_BUTTONS_XBOX || HAS_LEFTY_BUTTONS_XBOX || -HAS_DEFAULT_ALT_BUTTONS_XBOX || HAS_TACTICAL_ALT_BUTTONS_XBOX || HAS_LEFTY_ALT_BUTTONS_XBOX , SET1_BUTTONY_TEXT, BUTTON_TEXTOFFSET_Y, ITEM_ALIGN_TOP_LEFT ) - -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX || HAS_TACTICAL_BUTTONS_XBOX || HAS_LEFTY_BUTTONS_XBOX || -HAS_DEFAULT_ALT_BUTTONS_XBOX || HAS_TACTICAL_ALT_BUTTONS_XBOX || HAS_LEFTY_ALT_BUTTONS_XBOX , SET1_BUTTONSTART_TEXT, BUTTON_TEXTOFFSET_START, ITEM_ALIGN_TOP_LEFT ) - -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX || HAS_DEFAULT_ALT_BUTTONS_XBOX, SET1_BUTTONB_TEXT, BUTTON_TEXTOFFSET_B, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX, SET1_BUTTONWHITE_TEXT, BUTTON_TEXTOFFSET_WHITE, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX, SET1_BUTTONBLACK_TEXT, BUTTON_TEXTOFFSET_BLACK, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX || HAS_DEFAULT_ALT_BUTTONS_XBOX, SET1_BUTTONUP_TEXT, BUTTON_TEXTOFFSET_UP, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX || HAS_DEFAULT_ALT_BUTTONS_XBOX, SET1_BUTTONDOWN_TEXT, BUTTON_TEXTOFFSET_DOWN, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX || HAS_DEFAULT_ALT_BUTTONS_XBOX, SET1_BUTTONLEFT_TEXT, BUTTON_TEXTOFFSET_LEFT, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX || HAS_DEFAULT_ALT_BUTTONS_XBOX, SET1_BUTTONRIGHT_TEXT, BUTTON_TEXTOFFSET_RIGHT, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX, SET1_BUTTONLTRIG_TEXT, BUTTON_TEXTOFFSET_LTRIG, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX, SET1_BUTTONRTRIG_TEXT, BUTTON_TEXTOFFSET_RTRIG, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX || HAS_DEFAULT_ALT_BUTTONS_XBOX, SET1_BUTTONBACK_TEXT, BUTTON_TEXTOFFSET_BACK, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX || HAS_DEFAULT_ALT_BUTTONS_XBOX, SET1_BUTTONLSTICK_TEXT, BUTTON_TEXTOFFSET_LSTICK, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX || HAS_DEFAULT_ALT_BUTTONS_XBOX, SET1_BUTTONRSTICK_TEXT, BUTTON_TEXTOFFSET_RSTICK, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_DEFAULT_ALT_BUTTONS_XBOX, SET4_AND_5_BUTTONWHITE_TEXT, BUTTON_TEXTOFFSET_WHITE, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_DEFAULT_ALT_BUTTONS_XBOX, SET4_AND_5_BUTTONBLACK_TEXT, BUTTON_TEXTOFFSET_BLACK, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_DEFAULT_ALT_BUTTONS_XBOX, SET4_AND_5_BUTTONLTRIG_TEXT, BUTTON_TEXTOFFSET_LTRIG, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_DEFAULT_ALT_BUTTONS_XBOX, SET4_AND_5_BUTTONRTRIG_TEXT, BUTTON_TEXTOFFSET_RTRIG, ITEM_ALIGN_TOP_LEFT ) - -CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_XBOX || HAS_TACTICAL_ALT_BUTTONS_XBOX, SET2_BUTTONB_TEXT, BUTTON_TEXTOFFSET_B, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_XBOX, SET2_BUTTONWHITE_TEXT, BUTTON_TEXTOFFSET_WHITE, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_XBOX, SET2_BUTTONBLACK_TEXT, BUTTON_TEXTOFFSET_BLACK, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_XBOX || HAS_TACTICAL_ALT_BUTTONS_XBOX, SET2_BUTTONUP_TEXT, BUTTON_TEXTOFFSET_UP, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_XBOX || HAS_TACTICAL_ALT_BUTTONS_XBOX, SET2_BUTTONDOWN_TEXT, BUTTON_TEXTOFFSET_DOWN, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_XBOX || HAS_TACTICAL_ALT_BUTTONS_XBOX, SET2_BUTTONLEFT_TEXT, BUTTON_TEXTOFFSET_LEFT, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_XBOX || HAS_TACTICAL_ALT_BUTTONS_XBOX, SET2_BUTTONRIGHT_TEXT, BUTTON_TEXTOFFSET_RIGHT, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_XBOX, SET2_BUTTONLTRIG_TEXT, BUTTON_TEXTOFFSET_LTRIG, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_XBOX, SET2_BUTTONRTRIG_TEXT, BUTTON_TEXTOFFSET_RTRIG, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_XBOX || HAS_TACTICAL_ALT_BUTTONS_XBOX, SET2_BUTTONBACK_TEXT, BUTTON_TEXTOFFSET_BACK, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_XBOX || HAS_TACTICAL_ALT_BUTTONS_XBOX, SET2_BUTTONLSTICK_TEXT, BUTTON_TEXTOFFSET_LSTICK, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_XBOX || HAS_TACTICAL_ALT_BUTTONS_XBOX, SET2_BUTTONRSTICK_TEXT, BUTTON_TEXTOFFSET_RSTICK, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_TACTICAL_ALT_BUTTONS_XBOX, SET4_AND_5_BUTTONWHITE_TEXT, BUTTON_TEXTOFFSET_WHITE, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_TACTICAL_ALT_BUTTONS_XBOX, SET4_AND_5_BUTTONBLACK_TEXT, BUTTON_TEXTOFFSET_BLACK, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_TACTICAL_ALT_BUTTONS_XBOX, SET4_AND_5_BUTTONLTRIG_TEXT, BUTTON_TEXTOFFSET_LTRIG, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_TACTICAL_ALT_BUTTONS_XBOX, SET4_AND_5_BUTTONRTRIG_TEXT, BUTTON_TEXTOFFSET_RTRIG, ITEM_ALIGN_TOP_LEFT ) - -CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_XBOX || HAS_LEFTY_ALT_BUTTONS_XBOX, SET3_BUTTONB_TEXT, BUTTON_TEXTOFFSET_B, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_XBOX, SET3_BUTTONWHITE_TEXT, BUTTON_TEXTOFFSET_WHITE, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_XBOX, SET3_BUTTONBLACK_TEXT, BUTTON_TEXTOFFSET_BLACK, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_XBOX || HAS_LEFTY_ALT_BUTTONS_XBOX, SET3_BUTTONUP_TEXT, BUTTON_TEXTOFFSET_UP, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_XBOX || HAS_LEFTY_ALT_BUTTONS_XBOX, SET3_BUTTONDOWN_TEXT, BUTTON_TEXTOFFSET_DOWN, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_XBOX || HAS_LEFTY_ALT_BUTTONS_XBOX, SET3_BUTTONLEFT_TEXT, BUTTON_TEXTOFFSET_LEFT, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_XBOX || HAS_LEFTY_ALT_BUTTONS_XBOX, SET3_BUTTONRIGHT_TEXT, BUTTON_TEXTOFFSET_RIGHT, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_XBOX, SET3_BUTTONLTRIG_TEXT, BUTTON_TEXTOFFSET_LTRIG, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_XBOX, SET3_BUTTONRTRIG_TEXT, BUTTON_TEXTOFFSET_RTRIG, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_XBOX || HAS_LEFTY_ALT_BUTTONS_XBOX, SET3_BUTTONBACK_TEXT, BUTTON_TEXTOFFSET_BACK, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_XBOX || HAS_LEFTY_ALT_BUTTONS_XBOX, SET3_BUTTONLSTICK_TEXT, BUTTON_TEXTOFFSET_LSTICK, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_XBOX || HAS_LEFTY_ALT_BUTTONS_XBOX, SET3_BUTTONRSTICK_TEXT, BUTTON_TEXTOFFSET_RSTICK, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_LEFTY_ALT_BUTTONS_XBOX, SET6_BUTTONWHITE_TEXT, BUTTON_TEXTOFFSET_WHITE, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_LEFTY_ALT_BUTTONS_XBOX, SET6_BUTTONBLACK_TEXT, BUTTON_TEXTOFFSET_BLACK, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_LEFTY_ALT_BUTTONS_XBOX, SET6_BUTTONLTRIG_TEXT, BUTTON_TEXTOFFSET_LTRIG, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_LEFTY_ALT_BUTTONS_XBOX, SET6_BUTTONRTRIG_TEXT, BUTTON_TEXTOFFSET_RTRIG, ITEM_ALIGN_TOP_LEFT ) - -#undef BUTTON_ORIGIN -#undef BUTTON_TEXTOFFSET_A -#undef BUTTON_TEXTOFFSET_B -#undef BUTTON_TEXTOFFSET_X -#undef BUTTON_TEXTOFFSET_Y -#undef BUTTON_TEXTOFFSET_BLACK -#undef BUTTON_TEXTOFFSET_WHITE -#undef BUTTON_TEXTOFFSET_UP -#undef BUTTON_TEXTOFFSET_DOWN -#undef BUTTON_TEXTOFFSET_LEFT -#undef BUTTON_TEXTOFFSET_RIGHT -#undef BUTTON_TEXTOFFSET_LTRIG -#undef BUTTON_TEXTOFFSET_RTRIG -#undef BUTTON_TEXTOFFSET_START -#undef BUTTON_TEXTOFFSET_BACK -#undef BUTTON_TEXTOFFSET_LSTICK -#undef BUTTON_TEXTOFFSET_RSTICK - -#define BUTTON_ORIGIN 147 150 -#define BUTTON_TEXTOFFSET_A 315 225 -#define BUTTON_TEXTOFFSET_B 305 180 -#define BUTTON_TEXTOFFSET_X 312 200 -#define BUTTON_TEXTOFFSET_Y 303 157 -#define BUTTON_TEXTOFFSET_BLACK 57 112 -#define BUTTON_TEXTOFFSET_WHITE 302 112 -#define BUTTON_TEXTOFFSET_UP 28 180 -#define BUTTON_TEXTOFFSET_DOWN 35 175 -#define BUTTON_TEXTOFFSET_LEFT 28 180 -#define BUTTON_TEXTOFFSET_RIGHT 20 198 -#define BUTTON_TEXTOFFSET_LTRIG 67 95 -#define BUTTON_TEXTOFFSET_RTRIG 295 95 -#define BUTTON_TEXTOFFSET_START 160 90 -#define BUTTON_TEXTOFFSET_BACK 175 62 -#define BUTTON_TEXTOFFSET_LSTICK 78 217 -#define BUTTON_TEXTOFFSET_RSTICK 180 274 - -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY || HAS_TACTICAL_BUTTONS_SONY || HAS_LEFTY_BUTTONS_SONY || -HAS_DEFAULT_ALT_BUTTONS_SONY || HAS_TACTICAL_ALT_BUTTONS_SONY || HAS_LEFTY_ALT_BUTTONS_SONY , SET1_BUTTONA_TEXT, BUTTON_TEXTOFFSET_A, ITEM_ALIGN_TOP_LEFT ) - -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY || HAS_TACTICAL_BUTTONS_SONY || HAS_LEFTY_BUTTONS_SONY || -HAS_DEFAULT_ALT_BUTTONS_SONY || HAS_TACTICAL_ALT_BUTTONS_SONY || HAS_LEFTY_ALT_BUTTONS_SONY , SET1_BUTTONX_TEXT, BUTTON_TEXTOFFSET_X, ITEM_ALIGN_TOP_LEFT ) - -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY || HAS_TACTICAL_BUTTONS_SONY || HAS_LEFTY_BUTTONS_SONY || -HAS_DEFAULT_ALT_BUTTONS_SONY || HAS_TACTICAL_ALT_BUTTONS_SONY || HAS_LEFTY_ALT_BUTTONS_SONY , SET1_BUTTONY_TEXT, BUTTON_TEXTOFFSET_Y, ITEM_ALIGN_TOP_LEFT ) - -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY || HAS_TACTICAL_BUTTONS_SONY || HAS_LEFTY_BUTTONS_SONY || -HAS_DEFAULT_ALT_BUTTONS_SONY || HAS_TACTICAL_ALT_BUTTONS_SONY || HAS_LEFTY_ALT_BUTTONS_SONY , SET1_BUTTONSTART_TEXT, BUTTON_TEXTOFFSET_START, ITEM_ALIGN_TOP_LEFT ) - -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY || HAS_DEFAULT_ALT_BUTTONS_SONY, SET1_BUTTONB_TEXT, BUTTON_TEXTOFFSET_B, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY, SET1_BUTTONWHITE_TEXT, BUTTON_TEXTOFFSET_WHITE, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY, SET1_BUTTONBLACK_TEXT, BUTTON_TEXTOFFSET_BLACK, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY || HAS_DEFAULT_ALT_BUTTONS_SONY, SET1_BUTTONUP_TEXT, BUTTON_TEXTOFFSET_UP, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY || HAS_DEFAULT_ALT_BUTTONS_SONY, SET1_BUTTONDOWN_TEXT, BUTTON_TEXTOFFSET_DOWN, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY || HAS_DEFAULT_ALT_BUTTONS_SONY, SET1_BUTTONLEFT_TEXT, BUTTON_TEXTOFFSET_LEFT, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY || HAS_DEFAULT_ALT_BUTTONS_SONY, SET1_BUTTONRIGHT_TEXT, BUTTON_TEXTOFFSET_RIGHT, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY, SET1_BUTTONLTRIG_TEXT, BUTTON_TEXTOFFSET_LTRIG, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY, SET1_BUTTONRTRIG_TEXT, BUTTON_TEXTOFFSET_RTRIG, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY || HAS_DEFAULT_ALT_BUTTONS_SONY, SET1_BUTTONBACK_TEXT, BUTTON_TEXTOFFSET_BACK, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY || HAS_DEFAULT_ALT_BUTTONS_SONY, SET1_BUTTONLSTICK_TEXT, BUTTON_TEXTOFFSET_LSTICK, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY || HAS_DEFAULT_ALT_BUTTONS_SONY, SET1_BUTTONRSTICK_TEXT, BUTTON_TEXTOFFSET_RSTICK, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_DEFAULT_ALT_BUTTONS_SONY, SET4_AND_5_BUTTONWHITE_TEXT, BUTTON_TEXTOFFSET_WHITE, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_DEFAULT_ALT_BUTTONS_SONY, SET4_AND_5_BUTTONBLACK_TEXT, BUTTON_TEXTOFFSET_BLACK, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_DEFAULT_ALT_BUTTONS_SONY, SET4_AND_5_BUTTONLTRIG_TEXT, BUTTON_TEXTOFFSET_LTRIG, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_DEFAULT_ALT_BUTTONS_SONY, SET4_AND_5_BUTTONRTRIG_TEXT, BUTTON_TEXTOFFSET_RTRIG, ITEM_ALIGN_TOP_LEFT ) - -CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_SONY || HAS_TACTICAL_ALT_BUTTONS_SONY, SET2_BUTTONB_TEXT, BUTTON_TEXTOFFSET_B, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_SONY, SET2_BUTTONWHITE_TEXT, BUTTON_TEXTOFFSET_WHITE, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_SONY, SET2_BUTTONBLACK_TEXT, BUTTON_TEXTOFFSET_BLACK, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_SONY || HAS_TACTICAL_ALT_BUTTONS_SONY, SET2_BUTTONUP_TEXT, BUTTON_TEXTOFFSET_UP, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_SONY || HAS_TACTICAL_ALT_BUTTONS_SONY, SET2_BUTTONDOWN_TEXT, BUTTON_TEXTOFFSET_DOWN, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_SONY || HAS_TACTICAL_ALT_BUTTONS_SONY, SET2_BUTTONLEFT_TEXT, BUTTON_TEXTOFFSET_LEFT, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_SONY || HAS_TACTICAL_ALT_BUTTONS_SONY, SET2_BUTTONRIGHT_TEXT, BUTTON_TEXTOFFSET_RIGHT, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_SONY, SET2_BUTTONLTRIG_TEXT, BUTTON_TEXTOFFSET_LTRIG, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_SONY, SET2_BUTTONRTRIG_TEXT, BUTTON_TEXTOFFSET_RTRIG, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_SONY || HAS_TACTICAL_ALT_BUTTONS_SONY, SET2_BUTTONBACK_TEXT, BUTTON_TEXTOFFSET_BACK, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_SONY || HAS_TACTICAL_ALT_BUTTONS_SONY, SET2_BUTTONLSTICK_TEXT, BUTTON_TEXTOFFSET_LSTICK, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_SONY || HAS_TACTICAL_ALT_BUTTONS_SONY, SET2_BUTTONRSTICK_TEXT, BUTTON_TEXTOFFSET_RSTICK, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_TACTICAL_ALT_BUTTONS_SONY, SET4_AND_5_BUTTONWHITE_TEXT, BUTTON_TEXTOFFSET_WHITE, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_TACTICAL_ALT_BUTTONS_SONY, SET4_AND_5_BUTTONBLACK_TEXT, BUTTON_TEXTOFFSET_BLACK, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_TACTICAL_ALT_BUTTONS_SONY, SET4_AND_5_BUTTONLTRIG_TEXT, BUTTON_TEXTOFFSET_LTRIG, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_TACTICAL_ALT_BUTTONS_SONY, SET4_AND_5_BUTTONRTRIG_TEXT, BUTTON_TEXTOFFSET_RTRIG, ITEM_ALIGN_TOP_LEFT ) - -CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_SONY || HAS_LEFTY_ALT_BUTTONS_SONY, SET3_BUTTONB_TEXT, BUTTON_TEXTOFFSET_B, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_SONY, SET3_BUTTONWHITE_TEXT, BUTTON_TEXTOFFSET_WHITE, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_SONY, SET3_BUTTONBLACK_TEXT, BUTTON_TEXTOFFSET_BLACK, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_SONY || HAS_LEFTY_ALT_BUTTONS_SONY, SET3_BUTTONUP_TEXT, BUTTON_TEXTOFFSET_UP, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_SONY || HAS_LEFTY_ALT_BUTTONS_SONY, SET3_BUTTONDOWN_TEXT, BUTTON_TEXTOFFSET_DOWN, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_SONY || HAS_LEFTY_ALT_BUTTONS_SONY, SET3_BUTTONLEFT_TEXT, BUTTON_TEXTOFFSET_LEFT, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_SONY || HAS_LEFTY_ALT_BUTTONS_SONY, SET3_BUTTONRIGHT_TEXT, BUTTON_TEXTOFFSET_RIGHT, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_SONY, SET3_BUTTONLTRIG_TEXT, BUTTON_TEXTOFFSET_LTRIG, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_SONY, SET3_BUTTONRTRIG_TEXT, BUTTON_TEXTOFFSET_RTRIG, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_SONY || HAS_LEFTY_ALT_BUTTONS_SONY, SET3_BUTTONBACK_TEXT, BUTTON_TEXTOFFSET_BACK, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_SONY || HAS_LEFTY_ALT_BUTTONS_SONY, SET3_BUTTONLSTICK_TEXT, BUTTON_TEXTOFFSET_LSTICK, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_SONY || HAS_LEFTY_ALT_BUTTONS_SONY, SET3_BUTTONRSTICK_TEXT, BUTTON_TEXTOFFSET_RSTICK, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_LEFTY_ALT_BUTTONS_SONY, SET6_BUTTONWHITE_TEXT, BUTTON_TEXTOFFSET_WHITE, ITEM_ALIGN_TOP_LEFT ) -CONTROLS_BUTTON( HAS_LEFTY_ALT_BUTTONS_SONY, SET6_BUTTONBLACK_TEXT, BUTTON_TEXTOFFSET_BLACK, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_LEFTY_ALT_BUTTONS_SONY, SET6_BUTTONLTRIG_TEXT, BUTTON_TEXTOFFSET_LTRIG, ITEM_ALIGN_TOP_RIGHT ) -CONTROLS_BUTTON( HAS_LEFTY_ALT_BUTTONS_SONY, SET6_BUTTONRTRIG_TEXT, BUTTON_TEXTOFFSET_RTRIG, ITEM_ALIGN_TOP_LEFT ) \ No newline at end of file +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX || HAS_TACTICAL_BUTTONS_XBOX || HAS_LEFTY_BUTTONS_XBOX || +//HAS_DEFAULT_ALT_BUTTONS_XBOX || HAS_TACTICAL_ALT_BUTTONS_XBOX || HAS_LEFTY_ALT_BUTTONS_XBOX , SET1_BUTTONA_TEXT, BUTTON_TEXTOFFSET_A, ITEM_ALIGN_TOP_LEFT ) +// +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX || HAS_TACTICAL_BUTTONS_XBOX || HAS_LEFTY_BUTTONS_XBOX || +//HAS_DEFAULT_ALT_BUTTONS_XBOX || HAS_TACTICAL_ALT_BUTTONS_XBOX || HAS_LEFTY_ALT_BUTTONS_XBOX , SET1_BUTTONX_TEXT, BUTTON_TEXTOFFSET_X, ITEM_ALIGN_TOP_LEFT ) +// +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX || HAS_TACTICAL_BUTTONS_XBOX || HAS_LEFTY_BUTTONS_XBOX || +//HAS_DEFAULT_ALT_BUTTONS_XBOX || HAS_TACTICAL_ALT_BUTTONS_XBOX || HAS_LEFTY_ALT_BUTTONS_XBOX , SET1_BUTTONY_TEXT, BUTTON_TEXTOFFSET_Y, ITEM_ALIGN_TOP_LEFT ) +// +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX || HAS_TACTICAL_BUTTONS_XBOX || HAS_LEFTY_BUTTONS_XBOX || +//HAS_DEFAULT_ALT_BUTTONS_XBOX || HAS_TACTICAL_ALT_BUTTONS_XBOX || HAS_LEFTY_ALT_BUTTONS_XBOX , SET1_BUTTONSTART_TEXT, BUTTON_TEXTOFFSET_START, ITEM_ALIGN_TOP_LEFT ) +// +////#define CONTROLS_BUTTON(visArg, textArg, rectArg, alignArg ) +// +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX || HAS_DEFAULT_ALT_BUTTONS_XBOX, SET1_BUTTONB_TEXT, BUTTON_TEXTOFFSET_B, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX, SET1_BUTTONWHITE_TEXT, BUTTON_TEXTOFFSET_WHITE, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX, SET1_BUTTONBLACK_TEXT, BUTTON_TEXTOFFSET_BLACK, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX || HAS_DEFAULT_ALT_BUTTONS_XBOX, SET1_BUTTONUP_TEXT, BUTTON_TEXTOFFSET_UP, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX || HAS_DEFAULT_ALT_BUTTONS_XBOX, SET1_BUTTONDOWN_TEXT, BUTTON_TEXTOFFSET_DOWN, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX || HAS_DEFAULT_ALT_BUTTONS_XBOX, SET1_BUTTONLEFT_TEXT, BUTTON_TEXTOFFSET_LEFT, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX || HAS_DEFAULT_ALT_BUTTONS_XBOX, SET1_BUTTONRIGHT_TEXT, BUTTON_TEXTOFFSET_RIGHT, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX, SET1_BUTTONLTRIG_TEXT, BUTTON_TEXTOFFSET_LTRIG, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX, SET1_BUTTONRTRIG_TEXT, BUTTON_TEXTOFFSET_RTRIG, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX || HAS_DEFAULT_ALT_BUTTONS_XBOX, SET1_BUTTONBACK_TEXT, BUTTON_TEXTOFFSET_BACK, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX || HAS_DEFAULT_ALT_BUTTONS_XBOX, SET1_BUTTONLSTICK_TEXT, BUTTON_TEXTOFFSET_LSTICK, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_XBOX || HAS_DEFAULT_ALT_BUTTONS_XBOX, SET1_BUTTONRSTICK_TEXT, BUTTON_TEXTOFFSET_RSTICK, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_DEFAULT_ALT_BUTTONS_XBOX, SET4_AND_5_BUTTONWHITE_TEXT, BUTTON_TEXTOFFSET_WHITE, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_DEFAULT_ALT_BUTTONS_XBOX, SET4_AND_5_BUTTONBLACK_TEXT, BUTTON_TEXTOFFSET_BLACK, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_DEFAULT_ALT_BUTTONS_XBOX, SET4_AND_5_BUTTONLTRIG_TEXT, BUTTON_TEXTOFFSET_LTRIG, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_DEFAULT_ALT_BUTTONS_XBOX, SET4_AND_5_BUTTONRTRIG_TEXT, BUTTON_TEXTOFFSET_RTRIG, ITEM_ALIGN_TOP_LEFT ) +// +//CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_XBOX || HAS_TACTICAL_ALT_BUTTONS_XBOX, SET2_BUTTONB_TEXT, BUTTON_TEXTOFFSET_B, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_XBOX, SET2_BUTTONWHITE_TEXT, BUTTON_TEXTOFFSET_WHITE, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_XBOX, SET2_BUTTONBLACK_TEXT, BUTTON_TEXTOFFSET_BLACK, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_XBOX || HAS_TACTICAL_ALT_BUTTONS_XBOX, SET2_BUTTONUP_TEXT, BUTTON_TEXTOFFSET_UP, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_XBOX || HAS_TACTICAL_ALT_BUTTONS_XBOX, SET2_BUTTONDOWN_TEXT, BUTTON_TEXTOFFSET_DOWN, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_XBOX || HAS_TACTICAL_ALT_BUTTONS_XBOX, SET2_BUTTONLEFT_TEXT, BUTTON_TEXTOFFSET_LEFT, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_XBOX || HAS_TACTICAL_ALT_BUTTONS_XBOX, SET2_BUTTONRIGHT_TEXT, BUTTON_TEXTOFFSET_RIGHT, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_XBOX, SET2_BUTTONLTRIG_TEXT, BUTTON_TEXTOFFSET_LTRIG, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_XBOX, SET2_BUTTONRTRIG_TEXT, BUTTON_TEXTOFFSET_RTRIG, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_XBOX || HAS_TACTICAL_ALT_BUTTONS_XBOX, SET2_BUTTONBACK_TEXT, BUTTON_TEXTOFFSET_BACK, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_XBOX || HAS_TACTICAL_ALT_BUTTONS_XBOX, SET2_BUTTONLSTICK_TEXT, BUTTON_TEXTOFFSET_LSTICK, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_XBOX || HAS_TACTICAL_ALT_BUTTONS_XBOX, SET2_BUTTONRSTICK_TEXT, BUTTON_TEXTOFFSET_RSTICK, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_TACTICAL_ALT_BUTTONS_XBOX, SET4_AND_5_BUTTONWHITE_TEXT, BUTTON_TEXTOFFSET_WHITE, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_TACTICAL_ALT_BUTTONS_XBOX, SET4_AND_5_BUTTONBLACK_TEXT, BUTTON_TEXTOFFSET_BLACK, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_TACTICAL_ALT_BUTTONS_XBOX, SET4_AND_5_BUTTONLTRIG_TEXT, BUTTON_TEXTOFFSET_LTRIG, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_TACTICAL_ALT_BUTTONS_XBOX, SET4_AND_5_BUTTONRTRIG_TEXT, BUTTON_TEXTOFFSET_RTRIG, ITEM_ALIGN_TOP_LEFT ) +// +//CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_XBOX || HAS_LEFTY_ALT_BUTTONS_XBOX, SET3_BUTTONB_TEXT, BUTTON_TEXTOFFSET_B, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_XBOX, SET3_BUTTONWHITE_TEXT, BUTTON_TEXTOFFSET_WHITE, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_XBOX, SET3_BUTTONBLACK_TEXT, BUTTON_TEXTOFFSET_BLACK, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_XBOX || HAS_LEFTY_ALT_BUTTONS_XBOX, SET3_BUTTONUP_TEXT, BUTTON_TEXTOFFSET_UP, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_XBOX || HAS_LEFTY_ALT_BUTTONS_XBOX, SET3_BUTTONDOWN_TEXT, BUTTON_TEXTOFFSET_DOWN, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_XBOX || HAS_LEFTY_ALT_BUTTONS_XBOX, SET3_BUTTONLEFT_TEXT, BUTTON_TEXTOFFSET_LEFT, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_XBOX || HAS_LEFTY_ALT_BUTTONS_XBOX, SET3_BUTTONRIGHT_TEXT, BUTTON_TEXTOFFSET_RIGHT, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_XBOX, SET3_BUTTONLTRIG_TEXT, BUTTON_TEXTOFFSET_LTRIG, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_XBOX, SET3_BUTTONRTRIG_TEXT, BUTTON_TEXTOFFSET_RTRIG, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_XBOX || HAS_LEFTY_ALT_BUTTONS_XBOX, SET3_BUTTONBACK_TEXT, BUTTON_TEXTOFFSET_BACK, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_XBOX || HAS_LEFTY_ALT_BUTTONS_XBOX, SET3_BUTTONLSTICK_TEXT, BUTTON_TEXTOFFSET_LSTICK, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_XBOX || HAS_LEFTY_ALT_BUTTONS_XBOX, SET3_BUTTONRSTICK_TEXT, BUTTON_TEXTOFFSET_RSTICK, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_LEFTY_ALT_BUTTONS_XBOX, SET6_BUTTONWHITE_TEXT, BUTTON_TEXTOFFSET_WHITE, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_LEFTY_ALT_BUTTONS_XBOX, SET6_BUTTONBLACK_TEXT, BUTTON_TEXTOFFSET_BLACK, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_LEFTY_ALT_BUTTONS_XBOX, SET6_BUTTONLTRIG_TEXT, BUTTON_TEXTOFFSET_LTRIG, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_LEFTY_ALT_BUTTONS_XBOX, SET6_BUTTONRTRIG_TEXT, BUTTON_TEXTOFFSET_RTRIG, ITEM_ALIGN_TOP_LEFT ) +// +//#undef BUTTON_ORIGIN +//#undef BUTTON_TEXTOFFSET_A +//#undef BUTTON_TEXTOFFSET_B +//#undef BUTTON_TEXTOFFSET_X +//#undef BUTTON_TEXTOFFSET_Y +//#undef BUTTON_TEXTOFFSET_BLACK +//#undef BUTTON_TEXTOFFSET_WHITE +//#undef BUTTON_TEXTOFFSET_UP +//#undef BUTTON_TEXTOFFSET_DOWN +//#undef BUTTON_TEXTOFFSET_LEFT +//#undef BUTTON_TEXTOFFSET_RIGHT +//#undef BUTTON_TEXTOFFSET_LTRIG +//#undef BUTTON_TEXTOFFSET_RTRIG +//#undef BUTTON_TEXTOFFSET_START +//#undef BUTTON_TEXTOFFSET_BACK +//#undef BUTTON_TEXTOFFSET_LSTICK +//#undef BUTTON_TEXTOFFSET_RSTICK +// +//#define BUTTON_ORIGIN 147 150 +//#define BUTTON_TEXTOFFSET_A 315 225 +//#define BUTTON_TEXTOFFSET_B 305 180 +//#define BUTTON_TEXTOFFSET_X 312 200 +//#define BUTTON_TEXTOFFSET_Y 303 157 +//#define BUTTON_TEXTOFFSET_BLACK 57 112 +//#define BUTTON_TEXTOFFSET_WHITE 302 112 +//#define BUTTON_TEXTOFFSET_UP 28 180 +//#define BUTTON_TEXTOFFSET_DOWN 35 175 +//#define BUTTON_TEXTOFFSET_LEFT 28 180 +//#define BUTTON_TEXTOFFSET_RIGHT 20 198 +//#define BUTTON_TEXTOFFSET_LTRIG 67 95 +//#define BUTTON_TEXTOFFSET_RTRIG 295 95 +//#define BUTTON_TEXTOFFSET_START 160 90 +//#define BUTTON_TEXTOFFSET_BACK 175 62 +//#define BUTTON_TEXTOFFSET_LSTICK 78 217 +//#define BUTTON_TEXTOFFSET_RSTICK 180 274 +// +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY || HAS_TACTICAL_BUTTONS_SONY || HAS_LEFTY_BUTTONS_SONY || +//HAS_DEFAULT_ALT_BUTTONS_SONY || HAS_TACTICAL_ALT_BUTTONS_SONY || HAS_LEFTY_ALT_BUTTONS_SONY , SET1_BUTTONA_TEXT, BUTTON_TEXTOFFSET_A, ITEM_ALIGN_TOP_LEFT ) +// +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY || HAS_TACTICAL_BUTTONS_SONY || HAS_LEFTY_BUTTONS_SONY || +//HAS_DEFAULT_ALT_BUTTONS_SONY || HAS_TACTICAL_ALT_BUTTONS_SONY || HAS_LEFTY_ALT_BUTTONS_SONY , SET1_BUTTONX_TEXT, BUTTON_TEXTOFFSET_X, ITEM_ALIGN_TOP_LEFT ) +// +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY || HAS_TACTICAL_BUTTONS_SONY || HAS_LEFTY_BUTTONS_SONY || +//HAS_DEFAULT_ALT_BUTTONS_SONY || HAS_TACTICAL_ALT_BUTTONS_SONY || HAS_LEFTY_ALT_BUTTONS_SONY , SET1_BUTTONY_TEXT, BUTTON_TEXTOFFSET_Y, ITEM_ALIGN_TOP_LEFT ) +// +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY || HAS_TACTICAL_BUTTONS_SONY || HAS_LEFTY_BUTTONS_SONY || +//HAS_DEFAULT_ALT_BUTTONS_SONY || HAS_TACTICAL_ALT_BUTTONS_SONY || HAS_LEFTY_ALT_BUTTONS_SONY , SET1_BUTTONSTART_TEXT, BUTTON_TEXTOFFSET_START, ITEM_ALIGN_TOP_LEFT ) +// +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY || HAS_DEFAULT_ALT_BUTTONS_SONY, SET1_BUTTONB_TEXT, BUTTON_TEXTOFFSET_B, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY, SET1_BUTTONWHITE_TEXT, BUTTON_TEXTOFFSET_WHITE, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY, SET1_BUTTONBLACK_TEXT, BUTTON_TEXTOFFSET_BLACK, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY || HAS_DEFAULT_ALT_BUTTONS_SONY, SET1_BUTTONUP_TEXT, BUTTON_TEXTOFFSET_UP, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY || HAS_DEFAULT_ALT_BUTTONS_SONY, SET1_BUTTONDOWN_TEXT, BUTTON_TEXTOFFSET_DOWN, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY || HAS_DEFAULT_ALT_BUTTONS_SONY, SET1_BUTTONLEFT_TEXT, BUTTON_TEXTOFFSET_LEFT, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY || HAS_DEFAULT_ALT_BUTTONS_SONY, SET1_BUTTONRIGHT_TEXT, BUTTON_TEXTOFFSET_RIGHT, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY, SET1_BUTTONLTRIG_TEXT, BUTTON_TEXTOFFSET_LTRIG, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY, SET1_BUTTONRTRIG_TEXT, BUTTON_TEXTOFFSET_RTRIG, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY || HAS_DEFAULT_ALT_BUTTONS_SONY, SET1_BUTTONBACK_TEXT, BUTTON_TEXTOFFSET_BACK, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY || HAS_DEFAULT_ALT_BUTTONS_SONY, SET1_BUTTONLSTICK_TEXT, BUTTON_TEXTOFFSET_LSTICK, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_DEFAULT_BUTTONS_SONY || HAS_DEFAULT_ALT_BUTTONS_SONY, SET1_BUTTONRSTICK_TEXT, BUTTON_TEXTOFFSET_RSTICK, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_DEFAULT_ALT_BUTTONS_SONY, SET4_AND_5_BUTTONWHITE_TEXT, BUTTON_TEXTOFFSET_WHITE, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_DEFAULT_ALT_BUTTONS_SONY, SET4_AND_5_BUTTONBLACK_TEXT, BUTTON_TEXTOFFSET_BLACK, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_DEFAULT_ALT_BUTTONS_SONY, SET4_AND_5_BUTTONLTRIG_TEXT, BUTTON_TEXTOFFSET_LTRIG, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_DEFAULT_ALT_BUTTONS_SONY, SET4_AND_5_BUTTONRTRIG_TEXT, BUTTON_TEXTOFFSET_RTRIG, ITEM_ALIGN_TOP_LEFT ) +// +//CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_SONY || HAS_TACTICAL_ALT_BUTTONS_SONY, SET2_BUTTONB_TEXT, BUTTON_TEXTOFFSET_B, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_SONY, SET2_BUTTONWHITE_TEXT, BUTTON_TEXTOFFSET_WHITE, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_SONY, SET2_BUTTONBLACK_TEXT, BUTTON_TEXTOFFSET_BLACK, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_SONY || HAS_TACTICAL_ALT_BUTTONS_SONY, SET2_BUTTONUP_TEXT, BUTTON_TEXTOFFSET_UP, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_SONY || HAS_TACTICAL_ALT_BUTTONS_SONY, SET2_BUTTONDOWN_TEXT, BUTTON_TEXTOFFSET_DOWN, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_SONY || HAS_TACTICAL_ALT_BUTTONS_SONY, SET2_BUTTONLEFT_TEXT, BUTTON_TEXTOFFSET_LEFT, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_SONY || HAS_TACTICAL_ALT_BUTTONS_SONY, SET2_BUTTONRIGHT_TEXT, BUTTON_TEXTOFFSET_RIGHT, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_SONY, SET2_BUTTONLTRIG_TEXT, BUTTON_TEXTOFFSET_LTRIG, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_SONY, SET2_BUTTONRTRIG_TEXT, BUTTON_TEXTOFFSET_RTRIG, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_SONY || HAS_TACTICAL_ALT_BUTTONS_SONY, SET2_BUTTONBACK_TEXT, BUTTON_TEXTOFFSET_BACK, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_SONY || HAS_TACTICAL_ALT_BUTTONS_SONY, SET2_BUTTONLSTICK_TEXT, BUTTON_TEXTOFFSET_LSTICK, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_TACTICAL_BUTTONS_SONY || HAS_TACTICAL_ALT_BUTTONS_SONY, SET2_BUTTONRSTICK_TEXT, BUTTON_TEXTOFFSET_RSTICK, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_TACTICAL_ALT_BUTTONS_SONY, SET4_AND_5_BUTTONWHITE_TEXT, BUTTON_TEXTOFFSET_WHITE, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_TACTICAL_ALT_BUTTONS_SONY, SET4_AND_5_BUTTONBLACK_TEXT, BUTTON_TEXTOFFSET_BLACK, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_TACTICAL_ALT_BUTTONS_SONY, SET4_AND_5_BUTTONLTRIG_TEXT, BUTTON_TEXTOFFSET_LTRIG, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_TACTICAL_ALT_BUTTONS_SONY, SET4_AND_5_BUTTONRTRIG_TEXT, BUTTON_TEXTOFFSET_RTRIG, ITEM_ALIGN_TOP_LEFT ) +// +//CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_SONY || HAS_LEFTY_ALT_BUTTONS_SONY, SET3_BUTTONB_TEXT, BUTTON_TEXTOFFSET_B, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_SONY, SET3_BUTTONWHITE_TEXT, BUTTON_TEXTOFFSET_WHITE, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_SONY, SET3_BUTTONBLACK_TEXT, BUTTON_TEXTOFFSET_BLACK, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_SONY || HAS_LEFTY_ALT_BUTTONS_SONY, SET3_BUTTONUP_TEXT, BUTTON_TEXTOFFSET_UP, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_SONY || HAS_LEFTY_ALT_BUTTONS_SONY, SET3_BUTTONDOWN_TEXT, BUTTON_TEXTOFFSET_DOWN, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_SONY || HAS_LEFTY_ALT_BUTTONS_SONY, SET3_BUTTONLEFT_TEXT, BUTTON_TEXTOFFSET_LEFT, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_SONY || HAS_LEFTY_ALT_BUTTONS_SONY, SET3_BUTTONRIGHT_TEXT, BUTTON_TEXTOFFSET_RIGHT, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_SONY, SET3_BUTTONLTRIG_TEXT, BUTTON_TEXTOFFSET_LTRIG, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_SONY, SET3_BUTTONRTRIG_TEXT, BUTTON_TEXTOFFSET_RTRIG, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_SONY || HAS_LEFTY_ALT_BUTTONS_SONY, SET3_BUTTONBACK_TEXT, BUTTON_TEXTOFFSET_BACK, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_SONY || HAS_LEFTY_ALT_BUTTONS_SONY, SET3_BUTTONLSTICK_TEXT, BUTTON_TEXTOFFSET_LSTICK, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_LEFTY_BUTTONS_SONY || HAS_LEFTY_ALT_BUTTONS_SONY, SET3_BUTTONRSTICK_TEXT, BUTTON_TEXTOFFSET_RSTICK, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_LEFTY_ALT_BUTTONS_SONY, SET6_BUTTONWHITE_TEXT, BUTTON_TEXTOFFSET_WHITE, ITEM_ALIGN_TOP_LEFT ) +//CONTROLS_BUTTON( HAS_LEFTY_ALT_BUTTONS_SONY, SET6_BUTTONBLACK_TEXT, BUTTON_TEXTOFFSET_BLACK, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_LEFTY_ALT_BUTTONS_SONY, SET6_BUTTONLTRIG_TEXT, BUTTON_TEXTOFFSET_LTRIG, ITEM_ALIGN_TOP_RIGHT ) +//CONTROLS_BUTTON( HAS_LEFTY_ALT_BUTTONS_SONY, SET6_BUTTONRTRIG_TEXT, BUTTON_TEXTOFFSET_RTRIG, ITEM_ALIGN_TOP_LEFT ) \ No newline at end of file diff --git a/iw3sp_mod_ff_src/raw/ui/exec.menu b/iw3sp_mod_ff_src/raw/ui/exec.menu new file mode 100644 index 0000000..1615c28 --- /dev/null +++ b/iw3sp_mod_ff_src/raw/ui/exec.menu @@ -0,0 +1,119 @@ +#include "ui/menudef.h" + +{ + menuDef + { + name last_checkpoint + visible 0 + fullscreen 0 + rect 204 135 235 160 + focusColor COLOR_FOCUSED + style WINDOW_STYLE_FILLED + border 1 + popup + blurWorld 4.8 + onOpen + { + setfocus restart_yes; + } + onEsc + { + close "last_checkpoint"; + open "pausedmenu"; + } + + itemDef + { + name backimage2fade + style WINDOW_STYLE_SHADER + rect -160 2 555 180 + background "popmenu_bg" + visible 1 + decoration + } + + itemDef + { + name confirm + text "@IW3SP_MOD_LOC_MENU_LASTCHECKPOINT" //TITLE + style WINDOW_STYLE_EMPTY + textscale TEXTSIZE_TITLE + rect 126 25 110 20 + textalign ITEM_ALIGN_CENTER + textalignx -62 + textaligny 5 + decoration + forecolor COLOR_TITLE + visible 1 + } + itemDef + { + name txt + text "@IW3SP_MOD_LOC_MENU_LASTCHECKPOINT_DESC" + type ITEM_TYPE_BUTTON + textscale .35 + style WINDOW_STYLE_FILLED + textfont UI_FONT_NORMAL + rect 70 35 110 20 + textalign ITEM_ALIGN_CENTER + textalignx -5 + textaligny 19 + forecolor COLOR_UNFOCUSED + visible 1 + decoration + } + + itemDef + { + name restart_yes + text "@MENU_YES" + type ITEM_TYPE_BUTTON + textscale TEXTSIZE_DEFAULT + style WINDOW_STYLE_FILLED + textfont UI_FONT_NORMAL + rect 70 100 220 15 + textalign ITEM_ALIGN_CENTER + textalignx -60 + textaligny 19 + forecolor COLOR_UNFOCUSED + visible 1 + onFocus + { + play "mouse_over"; + } + action + { + play "mouse_click"; + close "last_checkpoint"; + exec "loadgame_continue" + } + } + + itemDef + { + name restart_no + text "@MENU_NO" + type ITEM_TYPE_BUTTON + textscale TEXTSIZE_DEFAULT + style WINDOW_STYLE_FILLED + textfont UI_FONT_NORMAL + rect 70 125 220 15 + textalign ITEM_ALIGN_CENTER + textalignx -60 + textaligny 19 + forecolor COLOR_UNFOCUSED + visible 1 + onFocus + { + play "mouse_over"; + } + action + { + play "mouse_click"; + close "last_checkpoint"; + close "pausedmenu"; + //uiScript saveRevert; + } + } + } +} \ No newline at end of file diff --git a/iw3sp_mod_ff_src/raw/ui/hud.menu b/iw3sp_mod_ff_src/raw/ui/hud.menu index f2775b8..63c8ca7 100644 --- a/iw3sp_mod_ff_src/raw/ui/hud.menu +++ b/iw3sp_mod_ff_src/raw/ui/hud.menu @@ -908,7 +908,7 @@ textstyle ITEM_TEXTSTYLE_SHADOWED textalign ITEM_ALIGN_TOP_CENTER forecolor 1 1 1 1 - textscale 0.34 + textscale 0.38 //0.34 visible 1 } } @@ -930,7 +930,7 @@ textstyle ITEM_TEXTSTYLE_SHADOWED textalign ITEM_ALIGN_TOP_CENTER forecolor 1 1 1 0 - textscale 0.34 + textscale 0.38 //0.34 visible 1 } } diff --git a/iw3sp_mod_ff_src/raw/ui/iw3sp_mod_settings_restart.menu b/iw3sp_mod_ff_src/raw/ui/iw3sp_mod_settings_restart.menu new file mode 100644 index 0000000..88b9f38 --- /dev/null +++ b/iw3sp_mod_ff_src/raw/ui/iw3sp_mod_settings_restart.menu @@ -0,0 +1,37 @@ +#include "ui/menudef.h" +#include "ui_mp/common_macro.inc" + +#define CHOICE_X_START 0 +#define CHOICE_Y_START 150 + +#define CHOICE_GROUP "iw3sp_mod_setting_restart" + +#include "ui_mp/menustyle.inc" +#include "ui/choices_setup_common.menu" + +#include "ui_mp/popupstyle.inc" +#include "ui/choices_setup_popmenu.menu" + +#undef CHOICE_SIZE_X +#define CHOICE_SIZE_X 320 + +#undef CHOICE_HORIZONTAL_ALIGN +#define CHOICE_HORIZONTAL_ALIGN HORIZONTAL_ALIGN_CENTER +#undef CHOICE_VERTICAL_ALIGN +#define CHOICE_VERTICAL_ALIGN VERTICAL_ALIGN_CENTER + +#define LOCAL_SETTING_ACTION \ + exec "exec options_iw3sp_mod_set.cfg"; \ + close self; \ + exec "vid_restart"; + +{ + menuDef + { + CENTER_POPUP_SETUP( iw3sp_mod_settings_restart, 4, ;, 1 ) + + CHOICE_POPMENU_TITLE( "@MENU_APPLY_SETTINGS" ) + CHOICE_BUTTON( 3, "@MENU_YES", close self; LOCAL_SETTING_ACTION ) + CHOICE_BUTTON( 4, "@MENU_NO", close self ) + } +} diff --git a/iw3sp_mod_ff_src/raw/ui/levels.menu b/iw3sp_mod_ff_src/raw/ui/levels.menu index b335cb1..6a63c7e 100644 --- a/iw3sp_mod_ff_src/raw/ui/levels.menu +++ b/iw3sp_mod_ff_src/raw/ui/levels.menu @@ -108,7 +108,8 @@ PREPROC_TEXT_DRAW_ALIGNED( ORIGIN_CHEATS_INDICATOR 100 20 HORIZONTAL_ALIGN_CENTE PREPROC_TEXT_DRAW_ALIGNED_EXP( ACT_ORIGIN CHOICE_SIZE_X 20 CHOICE_HORIZONTAL_ALIGN CHOICE_VERTICAL_ALIGN, -26 (base_y+4), ptitle, TEXTSIZE_DEFAULT, 0, 0, ITEM_ALIGN_MIDDLE_RIGHT, COLOR_TITLE group act_group ) #define LOCAL_BACK_BUTTON \ - itemDef {\ + itemDef \ + {\ name back\ text "@MENU_BACK"\ type 1\ @@ -119,12 +120,51 @@ PREPROC_TEXT_DRAW_ALIGNED( ORIGIN_CHEATS_INDICATOR 100 20 HORIZONTAL_ALIGN_CENTE textalign ITEM_ALIGN_LEFT\ textscale TEXTSIZE_SMALL\ textaligny 18\ - visible 1\ + visible when( dvarBool(console_menu_style) == 0 ); \ mouseEnter { play "mouse_over"; }\ action {\ play "mouse_click";\ close self;\ - } \ + }\ + }\ + itemDef \ + { \ + type ITEM_TYPE_BUTTON \ + rect 18 -24 40 20 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_BOTTOM \ + origin 0 0 \ + text "@MENU_BACK" \ + textfont UI_FONT_NORMAL \ + textscale TEXTSIZE_SMALL \ + textalign ITEM_ALIGN_BOTTOM_LEFT \ + visible when( dvarBool(console_menu_style) == 1 && dvarBool(gpad_in_use) == 0 ); \ + mouseEnter { play "mouse_over"; } \ + action \ + { \ + play "mouse_click"; \ + close self; \ + } \ + } \ + itemDef\ + {\ + rect 18 -4 0 0 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_BOTTOM\ + origin 0 0\ + textfont UI_FONT_NORMAL\ + textscale TEXTSIZE_SMALL\ + textalign ITEM_ALIGN_BOTTOM_LEFT\ + exp text( locString( "@IW3SP_MOD_LOC_PLATFORM_BACK_GAMEPAD_XBOX" ) + " " + locString( "@MENU_BACK" ) )\ + visible when( dvarBool(console_menu_style) == 1 && dvarBool(gpad_in_use) == 1 && dvarBool(gpad_style) == 0 );\ + decoration\ + }\ + itemDef\ + {\ + rect 18 -4 0 0 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_BOTTOM\ + origin 0 0\ + textfont UI_FONT_NORMAL\ + textscale TEXTSIZE_SMALL\ + textalign ITEM_ALIGN_BOTTOM_LEFT\ + exp text( locString( "@IW3SP_MOD_LOC_PLATFORM_BACK_GAMEPAD_SONY" ) + " " + locString( "@MENU_BACK" ) )\ + visible when( dvarBool(console_menu_style) == 1 && dvarBool(gpad_in_use) == 1 && dvarBool(gpad_style) == 1 );\ + decoration\ } #define LOCAL_UNLOCK_ALL \ diff --git a/iw3sp_mod_ff_src/raw/ui/main.menu b/iw3sp_mod_ff_src/raw/ui/main.menu index 32588c0..79edb96 100644 --- a/iw3sp_mod_ff_src/raw/ui/main.menu +++ b/iw3sp_mod_ff_src/raw/ui/main.menu @@ -158,7 +158,7 @@ uiScript addPlayerProfiles; uiScript openMenuOnDvar com_playerProfile "" player_profile; uiScript openMenuOnDvarNot ui_playerProfileCount 1 player_profile; - uiScript stopRefresh; + //uiScript stopRefresh; } execkeyint BUTTON_START { @@ -169,7 +169,7 @@ uiScript addPlayerProfiles; uiScript openMenuOnDvar com_playerProfile "" player_profile; uiScript openMenuOnDvarNot ui_playerProfileCount 1 player_profile; - uiScript stopRefresh; + //uiScript stopRefresh; } execkeyint 13 //K_ENTER = 13 { @@ -180,7 +180,7 @@ uiScript addPlayerProfiles; uiScript openMenuOnDvar com_playerProfile "" player_profile; uiScript openMenuOnDvarNot ui_playerProfileCount 1 player_profile; - uiScript stopRefresh; + //uiScript stopRefresh; } } } @@ -248,19 +248,21 @@ decoration visible when( !localVarBool( ui_hideBack ) ); } - // itemDef - // { - // name signedinas - // type ITEM_TYPE_TEXT - // rect 0 0 250 15 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP - // textscale TEXTSIZE_SMALL - // textstyle ITEM_TEXTSTYLE_SHADOWED - // textfont UI_FONT_NORMAL - // forecolor COLOR_UNFOCUSED - // ownerdraw UI_LOGGEDINUSER_PC - // visible when( !localVarBool( ui_hideBack ) ); - // decoration - // } + + // Replace original null ownerdraw on custom! + itemDef + { + name signedinas + type ITEM_TYPE_TEXT + rect 0 0 250 15 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP + textscale TEXTSIZE_SMALL + textstyle ITEM_TEXTSTYLE_SHADOWED + textfont UI_FONT_NORMAL + forecolor COLOR_UNFOCUSED + ownerdraw UI_LOGGEDINUSER + visible when( !localVarBool( ui_hideBack ) ); + decoration + } // all buttons will be hidden when option menus are opened, LocalVarBool(ui_hideBack) CHOICE_BUTTON_VIS( 1, "@IW3SP_MOD_LOC_MENU_CHECK_FOR_UPDATE", open updater_checking_for_updates_internal; LOCAL_ARCADE_RESET, when( !localvarBool( ui_hideBack ) ); ) diff --git a/iw3sp_mod_ff_src/raw/ui/menudefinition.h b/iw3sp_mod_ff_src/raw/ui/menudefinition.h index 53fb1f3..456767d 100644 --- a/iw3sp_mod_ff_src/raw/ui/menudefinition.h +++ b/iw3sp_mod_ff_src/raw/ui/menudefinition.h @@ -285,8 +285,9 @@ #define CG_TALKER3 195 #define CG_TALKER4 196 -#define UI_LOGGEDINUSER_PC 197 - +// IW3SP-MOD Ownerdraws +#define UI_GPAD_STICKS_SCHEME 197 +#define UI_GPAD_BUTTONS_SCHEME 198 #define UI_OWNERDRAW_BASE 200 #define UI_HANDICAP 200 @@ -316,7 +317,7 @@ #define UI_TALKER3 269 #define UI_TALKER4 270 #define UI_PARTYSTATUS 271 -#define UI_LOGGEDINUSER 272 +#define UI_LOGGEDINUSER 272 // MODIFIED BY IW3SP-MOD #define UI_RESERVEDSLOTS 273 #define UI_PLAYLISTNAME 274 #define UI_PLAYLISTDESCRIPTION 275 diff --git a/iw3sp_mod_ff_src/raw/ui/menus.txt b/iw3sp_mod_ff_src/raw/ui/menus.txt index ee7e1bb..537a73f 100644 --- a/iw3sp_mod_ff_src/raw/ui/menus.txt +++ b/iw3sp_mod_ff_src/raw/ui/menus.txt @@ -37,6 +37,8 @@ //Added 09.24.2023 (8:27 PM) loadMenu { "ui/options_controls_settings.menu" } loadMenu { "ui/options_controls_main.menu" } + //Added 03.24.2023 (8:19 PM) + loadMenu { "ui/iw3sp_mod_settings_restart.menu" } loadMenu { "ui/playerprofile.menu" } loadMenu { "ui/briefing.menu" } diff --git a/iw3sp_mod_ff_src/raw/ui/options_game_pc.menu b/iw3sp_mod_ff_src/raw/ui/options_game_pc.menu index 57d24fd..4642fd2 100644 --- a/iw3sp_mod_ff_src/raw/ui/options_game_pc.menu +++ b/iw3sp_mod_ff_src/raw/ui/options_game_pc.menu @@ -56,7 +56,8 @@ //CHOICE_BUTTON_VIS( 26, "@MENU_CHEATS_LOWCASE", open menu_special_features; close self;, when( dvarBool( sv_running ) && !dvarBool(ui_multiplayer) && !dvarBool( arcademode ) && !dvarBool( arcademode_full ) ); ) // Removed 10.13.2023 (1:17 PM) //CHOICE_DVARFLOATLIST_VIS( 26, "@MENU_LANGUAGE", ui_language, { "@MENU_ENGLISH" 0 "@MENU_FRENCH" 1 "@MENU_GERMAN" 2 "@MENU_ITALIAN" 3 "@MENU_SPANISH" 4 "@MENU_BRITISH" 5 "@MENU_RUSSIAN" 6 "@MENU_POLISH" 7 "@MENU_KOREAN" 8 "@MENU_TAIWANESE" 9 "@MENU_JAPANESE" 10 "@MENU_CHINESE" 11 "@MENU_THAI" 12 }, uiScript verifyLanguage, 1 ) - + CHOICE_DVARFLOATLIST( 25, "@IW3SP_MOD_LOC_MENU_ENABLE_HITMARKERS", cg_drawDamageFeedbackOption, { "@MENU_DISABLED" 0 "@MENU_ENABLED" 1 }, ; ) + CHOICE_DVARFLOATLIST( 26, "@IW3SP_MOD_LOC_MENU_ENABLE_HIT_SOUND", snd_hitsoundDisabled, { "@MENU_ENABLED" 0 "@MENU_DISABLED" 1 }, ; ) // Removed 10.13.2023 (1:18 PM) /* diff --git a/iw3sp_mod_ff_src/raw/ui/options_graphics_pc.menu b/iw3sp_mod_ff_src/raw/ui/options_graphics_pc.menu index 2c65d2a..3b16b48 100644 --- a/iw3sp_mod_ff_src/raw/ui/options_graphics_pc.menu +++ b/iw3sp_mod_ff_src/raw/ui/options_graphics_pc.menu @@ -37,6 +37,7 @@ // setfromdvar dst src exec "exec options_graphics.cfg"; + exec "exec options_iw3sp_mod_set.cfg"; execOnDvarFloatValue r_zfeather 0 "set ui_zfeather 0"; // off execOnDvarFloatValue r_zfeather 1 "set ui_zfeather 1"; // world diff --git a/iw3sp_mod_ff_src/raw/ui/options_iw3sp_mod.menu b/iw3sp_mod_ff_src/raw/ui/options_iw3sp_mod.menu index 632afe0..a81040e 100644 --- a/iw3sp_mod_ff_src/raw/ui/options_iw3sp_mod.menu +++ b/iw3sp_mod_ff_src/raw/ui/options_iw3sp_mod.menu @@ -29,8 +29,12 @@ close options_graphics_texture; close options_control_defaults; + setLocalVarBool ui_showApply 0; setLocalVarBool ui_hideBack 1; + // setfromdvar dst src + exec "exec options_iw3sp_mod.cfg"; + uiScript getLanguage; } onClose @@ -50,5 +54,51 @@ CHOICE_DVARYESNO( 23, "@IW3SP_MOD_LOC_MENU_BRANDING", cg_drawBrandingInfo, ; ) CHOICE_DVARYESNO( 24, "@IW3SP_MOD_LOC_MENU_EXTERNAL_CONSOLE", external_console, ; ) CHOICE_DVARYESNO( 25, "@IW3SP_MOD_LOC_MENU_ALLOW_CHEATS_CMD", sv_allowCheats, exec "applyCheat"; ) + CHOICE_DVARFLOATLIST( 26, "Console UI", ui_console_menu_style, { "@MENU_DISABLED" 0 "@MENU_ENABLED" 1 }, setLocalVarBool ui_showApply 1; ) + + // Added 03.24.2024 (8:02 PM) + itemDef + { + name apply + text "@MENU_APPLY" + type 1 + style WINDOW_STYLE_FILLED + textstyle ITEM_TEXTSTYLE_SHADOWED + rect 200 -26 80 20 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM + textfont UI_FONT_NORMAL + textalign ITEM_ALIGN_LEFT + textscale TEXTSIZE_SMALL + textaligny 18 + visible when( localVarBool( ui_showApply ) && !dvarint( sv_running ) ); + mouseEnter { play "mouse_over"; } + action + { + play "mouse_click"; + open iw3sp_mod_settings_restart + } + } + + itemDef + { + name apply2 + text "@MENU_APPLY" + type 1 + style WINDOW_STYLE_FILLED + textstyle ITEM_TEXTSTYLE_SHADOWED + rect 200 -26 80 20 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM + textfont UI_FONT_NORMAL + textalign ITEM_ALIGN_LEFT + textscale TEXTSIZE_SMALL + textaligny 18 + visible when( localVarBool( ui_showApply ) && dvarint( sv_running ) ); + mouseEnter { play "mouse_over"; } + action + { + play "mouse_click"; + uiScript openMenuOnDvar g_reloading 0 vid_restart_popmenu_listen; + uiScript openMenuOnDvarNot g_reloading 0 vid_restart_popmenu_dead; + } + } + } } diff --git a/iw3sp_mod_ff_src/raw/ui/pregame.menu b/iw3sp_mod_ff_src/raw/ui/pregame.menu index 180a2ad..a88f26c 100644 --- a/iw3sp_mod_ff_src/raw/ui/pregame.menu +++ b/iw3sp_mod_ff_src/raw/ui/pregame.menu @@ -48,20 +48,30 @@ itemDef { type ITEM_TYPE_TEXT - #ifdef PC - rect -250 388 500 0 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_TOP - #else - rect -225 352 450 0 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_TOP - #endif + rect -250 388 500 0 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_TOP textcinematicsubtitle textfont UI_FONT_DEFAULT textstyle ITEM_TEXTSTYLE_SHADOWED textscale 0.38 textalign ITEM_ALIGN_TOP_CENTER - visible 1 + visible when( dvarBool(console_menu_style) == 0 ) decoration autowrapped - } + } + + itemDef + { + type ITEM_TYPE_TEXT + rect -225 352 450 0 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_TOP + textcinematicsubtitle + textfont UI_FONT_DEFAULT + textstyle ITEM_TEXTSTYLE_SHADOWED + textscale 0.38 + textalign ITEM_ALIGN_TOP_CENTER + visible when( dvarBool(console_menu_style) == 1 ) + decoration + autowrapped + } itemDef { diff --git a/iw3sp_mod_ff_src/raw/ui_mp/navcontrols.inc b/iw3sp_mod_ff_src/raw/ui_mp/navcontrols.inc index 9ac05ed..ff460a6 100644 --- a/iw3sp_mod_ff_src/raw/ui_mp/navcontrols.inc +++ b/iw3sp_mod_ff_src/raw/ui_mp/navcontrols.inc @@ -2,126 +2,130 @@ #define ALT_PANEL 0 #endif -#ifdef SPLITSCREEN_ENABLED - itemDef { - style WINDOW_STYLE_SHADER - rect -320 0 500 64 0 0 - background "white" - forecolor 0.9 0.9 0.95 0.175 - visible 1 decoration } - itemDef { - style WINDOW_STYLE_SHADER - rect 180 0 16 -64 0 0 - origin 0 0 - background HIGHLIGHT_SHADER_ART - forecolor 0.9 0.9 0.95 0.175 - visible 1 decoration } -#endif - #ifdef PC - itemDef { + itemDef + { style WINDOW_STYLE_SHADER rect -120 -32 378 64 0 0 background "white" forecolor 0.9 0.9 0.95 0.175 - visible 1 - decoration } - itemDef { + visible when(dvarBool( console_menu_style ) == 0) + decoration +} + itemDef + { style WINDOW_STYLE_SHADER rect 258 -32 16 -64 0 0 origin 0 0 background HIGHLIGHT_SHADER_ART forecolor 0.9 0.9 0.95 0.175 - visible 1 - decoration } + visible when(dvarBool( console_menu_style ) == 0) + decoration + } itemDef { style WINDOW_STYLE_SHADER rect 56 448 528 40 0 0 background "white" forecolor 0.9 0.9 0.95 0.175 - visible 1 - decoration } - itemDef { + visible when(dvarBool( console_menu_style ) == 0) + decoration + } + itemDef + { style WINDOW_STYLE_SHADER rect 584 448 16 64 0 0 origin 0 0 background HIGHLIGHT_SHADER_ART forecolor 0.9 0.9 0.95 0.175 - visible 1 - decoration } - itemDef { + visible when(dvarBool( console_menu_style ) == 0) + decoration + } + itemDef + { style WINDOW_STYLE_SHADER rect 40 448 -16 64 0 0 origin 0 0 background HIGHLIGHT_SHADER_ART forecolor 0.9 0.9 0.95 0.175 - visible 1 - decoration } - itemDef { + visible when(dvarBool( console_menu_style ) == 0) + decoration + } + itemDef + { style WINDOW_STYLE_SHADER rect -120 464 160 32 0 0 background "white" forecolor 0.9 0.9 0.95 0.175 - visible 1 - decoration } - itemDef { + visible when(dvarBool( console_menu_style ) == 0) + decoration + } + itemDef + { style WINDOW_STYLE_SHADER rect 600 464 160 32 0 0 background "white" forecolor 0.9 0.9 0.95 0.175 - visible 1 - decoration } -#endif + visible when(dvarBool( console_menu_style ) == 0) + decoration + } -#ifndef SPLITSCREEN_ENABLED -#ifndef PC - itemDef { + itemDef + { style WINDOW_STYLE_SHADER rect -120 0 420 68 0 0 background "white" forecolor 0.9 0.9 0.95 0.175 - visible when( ENABLE_TITLE_BG ); - decoration } - itemDef { + visible when( ENABLE_TITLE_BG && dvarBool( console_menu_style ) == 1 ); + decoration + } + itemDef + { style WINDOW_STYLE_SHADER rect 300 0 16 -68 0 0 origin 0 0 background HIGHLIGHT_SHADER_ART forecolor 0.9 0.9 0.95 0.175 - visible when( ENABLE_TITLE_BG ); - decoration } - itemDef { + visible when( ENABLE_TITLE_BG && dvarBool( console_menu_style ) == 1 ); + decoration + } + itemDef + { style WINDOW_STYLE_SHADER rect -120 414 1200 64 0 0 background "white" forecolor 0.9 0.9 0.95 0.175 - visible when( ENABLE_TITLE_BG && ALT_PANEL ); - decoration } - itemDef { + visible when( ENABLE_TITLE_BG && ALT_PANEL && dvarBool( console_menu_style ) == 1 ); + decoration + } + itemDef + { style WINDOW_STYLE_SHADER rect -120 416 420 64 0 0 background "white" forecolor 0.9 0.9 0.95 0.175 - visible when( ENABLE_TITLE_BG && (ALT_PANEL == 0) ); - decoration } - itemDef { + visible when( ENABLE_TITLE_BG && (ALT_PANEL == 0) && dvarBool( console_menu_style ) == 1 ); + decoration + } + itemDef + { style WINDOW_STYLE_SHADER rect 300 416 16 64 0 0 origin 0 0 background HIGHLIGHT_SHADER_ART forecolor 0.9 0.9 0.95 0.175 - visible when( ENABLE_TITLE_BG && (ALT_PANEL == 0) ); - decoration } - itemDef { + visible when( ENABLE_TITLE_BG && (ALT_PANEL == 0) && dvarBool( console_menu_style ) == 1 ); + decoration + } + itemDef + { style WINDOW_STYLE_SHADER rect 316 432 440 64 0 0 background "white" forecolor 0.9 0.9 0.95 0.175 - visible when( ENABLE_TITLE_BG && (ALT_PANEL == 0) ); - decoration } -#endif -#endif + visible when( ENABLE_TITLE_BG && (ALT_PANEL == 0) && dvarBool( console_menu_style ) == 1 ); + decoration + } #ifdef CONSOLE #define LOCAL_NOT_IN_CAC ( !menuisopen("menu_cac_assault") && !menuisopen("menu_cac_heavygunner") && !menuisopen("menu_cac_sniper") && !menuisopen("menu_cac_specops") && !menuisopen("menu_cac_demolitions") ) @@ -152,8 +156,8 @@ { play "mouse_click"; execNow "toggle lb_filter 0 1"; - } } + } #ifndef BUTTON_X_GOTOTOP #define BUTTON_X_GOTOTOP 0 @@ -170,7 +174,7 @@ rect 0 -4 0 0 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM visible when( BUTTON_X_GOTOTOP ); decoration - } + } #ifndef BUTTON_PGUP #define BUTTON_PGUP 0 @@ -194,7 +198,7 @@ rect -20 -4 0 0 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM visible when( BUTTON_REFRESH ); decoration - } + } // page up and down itemDef @@ -207,7 +211,7 @@ rect -190 -4 0 0 HORIZONTAL_ALIGN_RIGHT VERTICAL_ALIGN_BOTTOM visible when( BUTTON_PGUP ); decoration - } + } itemDef { name pgdown @@ -218,7 +222,7 @@ rect -90 -4 0 0 HORIZONTAL_ALIGN_RIGHT VERTICAL_ALIGN_BOTTOM visible when( BUTTON_PGDOWN ); decoration - } + } itemDef { @@ -229,7 +233,7 @@ forecolor 1 1 1 1 visible 1 decoration - } + } itemDef { rect 18 -4 0 0 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_BOTTOM @@ -240,7 +244,7 @@ textalign ITEM_ALIGN_BOTTOM_LEFT visible WHEN( LOCAL_NOT_IN_CAC ); decoration - } + } itemDef { rect 18 -4 0 0 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_BOTTOM @@ -251,7 +255,7 @@ textalign ITEM_ALIGN_BOTTOM_LEFT visible when( LOCAL_IN_CAC ); decoration - } + } #endif // #ifdef CONSOLE @@ -264,12 +268,65 @@ #ifndef BACK_OPEN #define BACK_OPEN open main_text; #endif + + itemDef + { + style WINDOW_STYLE_SHADER + rect 0 -20 16 16 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_BOTTOM + origin 0 0 + background "ui_arrow_left" + forecolor 1 1 1 1 + visible when (dvarBool(console_menu_style) == 1 ); + decoration + } + + itemDef + { + type ITEM_TYPE_BUTTON + rect 18 -24 40 20 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_BOTTOM + origin 0 0 + text "@MENU_BACK" + textfont UI_FONT_NORMAL + textscale TEXTSIZE_SMALL + textalign ITEM_ALIGN_BOTTOM_LEFT + visible when( BACK_ENABLE && dvarBool(console_menu_style) == 1 && dvarBool(gpad_in_use) == 0 ); + mouseEnter { play "mouse_over"; } + action + { + play "mouse_click"; + close self; + BACK_OPEN + } + } + + itemDef + { + rect 18 -4 0 0 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_BOTTOM + origin 0 0 + textfont UI_FONT_NORMAL + textscale TEXTSIZE_SMALL + textalign ITEM_ALIGN_BOTTOM_LEFT + exp text( locString( "@IW3SP_MOD_LOC_PLATFORM_BACK_GAMEPAD_XBOX" ) + " " + locString( "@MENU_BACK" ) ) + visible when( BACK_ENABLE && dvarBool(console_menu_style) == 1 && dvarBool(gpad_in_use) == 1 && dvarBool(gpad_style) == 0 ); + decoration + } + itemDef + { + rect 18 -4 0 0 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_BOTTOM + origin 0 0 + textfont UI_FONT_NORMAL + textscale TEXTSIZE_SMALL + textalign ITEM_ALIGN_BOTTOM_LEFT + exp text( locString( "@IW3SP_MOD_LOC_PLATFORM_BACK_GAMEPAD_SONY" ) + " " + locString( "@MENU_BACK" ) ) + visible when( BACK_ENABLE && dvarBool(console_menu_style) == 1 && dvarBool(gpad_in_use) == 1 && dvarBool(gpad_style) == 1 ); + decoration + } itemDef { name back text "@MENU_BACK" - type 1 + type ITEM_TYPE_BUTTON style WINDOW_STYLE_FILLED textstyle ITEM_TEXTSTYLE_SHADOWED rect -250 -26 40 20 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM @@ -277,14 +334,14 @@ textalign ITEM_ALIGN_LEFT textscale TEXTSIZE_SMALL textaligny 18 - visible when(BACK_ENABLE); + visible when( BACK_ENABLE && dvarBool(console_menu_style) == 0 ); mouseEnter { play "mouse_over"; } action { play "mouse_click"; close self; BACK_OPEN - } + } } #endif // #ifdef PC \ No newline at end of file