IAmChrisAMA
/
iw4x-rawfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6 from diamante0018/develop 

fix(menus): Use OAT to track down mistakes
pull/8/head
Louve 2023-12-16 11:10:17 +01:00 committed by GitHub
parent 4c1e11024b 49b871ec68
commit 44e614a4fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
35 changed files with 1106 additions and 1086 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
iw4x/iw4x_00/ui_mp/bg.inc
View File

@ -34,7 +34,7 @@ itemDef
forecolor 0 0 0 0.4 forecolor 0 0 0 0.4
background "white" background "white"
textscale 0.55 textscale 0.55
visible when ((dvarBool("cl_ingame") || dvarBool("sv_running"))) visible when ( dvarBool("cl_ingame") || dvarBool("sv_running") )
} }
itemDef itemDef
{ {

4
iw4x/iw4x_00/ui_mp/cac_popup.menu
View File

@ -10,7 +10,7 @@
style 1 style 1
foreColor 1 1 1 1 foreColor 1 1 1 1
backColor 1 1 1 1 backColor 1 1 1 1
background white background "white"
exp rect Y ( localvarfloat( "ui_cac_popup_ypos" ) ) exp rect Y ( localvarfloat( "ui_cac_popup_ypos" ) )
exp rect H ( CALCULATED_HEIGHT ) exp rect H ( CALCULATED_HEIGHT )
fadeCycle 1 fadeCycle 1
@ -66,7 +66,7 @@
background white background white
decoration decoration
visible 1 visible 1
exp rect H ( ) exp rect H ( CALCULATED_HEIGHT )
} }
itemDef itemDef
{ {

7
iw4x/iw4x_00/ui_mp/connect.menu
View File

@ -258,7 +258,9 @@
text "@MENU_INTEL" text "@MENU_INTEL"
visible when ( dvarbool( "wideScreen" ) ) visible when ( dvarbool( "wideScreen" ) )
} }
/*itemDef
#ifdef DRAW_IW_LOGO
itemDef
{ {
//rect -104 -56 128 64 3 3 //rect -104 -56 128 64 3 3
rect -170 -66 128 64 3 3 rect -170 -66 128 64 3 3
@ -280,6 +282,7 @@
background "logo_iw" background "logo_iw"
textscale 0.55 textscale 0.55
visible when ( !dvarbool( "wideScreen" ) ) visible when ( !dvarbool( "wideScreen" ) )
}*/ }
#endif
} }
} }

4
iw4x/iw4x_00/ui_mp/controls_multi.menu
View File

@ -40,8 +40,9 @@
#define ON_MENU_ESC \ #define ON_MENU_ESC \
close self; close self;
menuDef
{ {
menuDef
{
name MENU_NAME name MENU_NAME
rect 0 0 640 480 rect 0 0 640 480
foreColor CHOICE_TEXTCOLOR foreColor CHOICE_TEXTCOLOR
@ -70,4 +71,5 @@ menuDef
PC_OPTIONS_KEYBINDSTATUS PC_OPTIONS_KEYBINDSTATUS
ITEM_BUTTON_BACK(ON_MENU_ESC) ITEM_BUTTON_BACK(ON_MENU_ESC)
}
} }

4
iw4x/iw4x_00/ui_mp/createserver.menu
View File

@ -274,8 +274,9 @@
open "settings_quick_gtnw"; \ open "settings_quick_gtnw"; \
} }
menuDef
{ {
menuDef
{
name MENU_NAME name MENU_NAME
fullscreen 1 fullscreen 1
rect 0 0 640 480 rect 0 0 640 480
@ -319,4 +320,5 @@ menuDef
MENU_PANEL_MAP_PREVIEW MENU_PANEL_MAP_PREVIEW
ITEM_BUTTON_FRIENDS(-120) ITEM_BUTTON_FRIENDS(-120)
}
} }

6
iw4x/iw4x_00/ui_mp/dpad_hd.menu
View File

@ -42,7 +42,6 @@
textScale 0.3333 textScale 0.3333
textStyle 3 textStyle 3
textFont 10 textFont 10
feeder 0
visible when ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) visible when ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) )
} }
itemDef itemDef
@ -67,7 +66,6 @@
textScale 0.25 textScale 0.25
textStyle 6 textStyle 6
textFont 6 textFont 6
feeder 0
visible 1 visible 1
exp text ( "^3" + keybinding( "+actionslot 1" ) ) exp text ( "^3" + keybinding( "+actionslot 1" ) )
visible when ( ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) && actionslotusable( 1 ) ) visible when ( ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) && actionslotusable( 1 ) )
@ -93,7 +91,6 @@
textScale 0.3333 textScale 0.3333
textStyle 3 textStyle 3
textFont 10 textFont 10
feeder 0
visible when ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) visible when ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) )
} }
itemDef itemDef
@ -118,7 +115,6 @@
textScale 0.25 textScale 0.25
textStyle 6 textStyle 6
textFont 6 textFont 6
feeder 0
visible 1 visible 1
exp text ( "^3" + keybinding( "+actionslot 3" ) ) exp text ( "^3" + keybinding( "+actionslot 3" ) )
visible when ( ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) && actionslotusable( 3 ) ) visible when ( ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) && actionslotusable( 3 ) )
@ -144,7 +140,6 @@
textScale 0.3333 textScale 0.3333
textStyle 3 textStyle 3
textFont 10 textFont 10
feeder 0
visible when ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) visible when ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) )
} }
itemDef itemDef
@ -169,7 +164,6 @@
textScale 0.25 textScale 0.25
textStyle 6 textStyle 6
textFont 6 textFont 6
feeder 0
visible 1 visible 1
exp text ( "^3" + keybinding( "+actionslot 4" ) ) exp text ( "^3" + keybinding( "+actionslot 4" ) )
visible when ( ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) && actionslotusable( 4 ) ) visible when ( ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) && actionslotusable( 4 ) )

4
iw4x/iw4x_00/ui_mp/iw4x_credits.menu
View File

@ -92,8 +92,9 @@
#define MESSAGE_CREDITS "@IW4X_CREDITS" #define MESSAGE_CREDITS "@IW4X_CREDITS"
menuDef
{ {
menuDef
{
name MENU_NAME name MENU_NAME
fullscreen 1 fullscreen 1
rect 0 0 640 480 rect 0 0 640 480
@ -114,4 +115,5 @@ menuDef
MENU_ITEM_CREDITS_BOX("IW4x", MESSAGE_CREDITS) MENU_ITEM_CREDITS_BOX("IW4x", MESSAGE_CREDITS)
ITEM_BUTTON_BACK(close self;) ITEM_BUTTON_BACK(close self;)
}
} }

12
iw4x/iw4x_00/ui_mp/main_text.menu
View File

@ -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(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_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_HORIZONTAL_LINE_VIS(9, 1)
MENU_CHOICE_BUTTON_VIS(9, button_9, "@MENU_STORE_CAPS", uiScript "downloadDLC" 1, "@MPUI_DESC_STORE", 1) MENU_CHOICE_BUTTON_VIS(9, button_9, "@MENU_SP_CREDITS_CAPS", open iw4x_credits;, "@NULL_EMPTY", 1)
MENU_CHOICE_NEWICON_VIS(9, when(!dvarBool(isDlcInstalled_All))) MENU_CHOICE_BUTTON_VIS(10, button_10, "@MENU_VISIT_WEBSITE_CAPS", uiScript "visitWebsite", "@NULL_EMPTY", 1)
MENU_CHOICE_BUTTON_VIS(10, button_10, "@MENU_SP_CREDITS_CAPS", open iw4x_credits;, "@NULL_EMPTY", 1) MENU_CHOICE_HORIZONTAL_LINE_VIS(11, 1)
MENU_CHOICE_BUTTON_VIS(11, button_11, "@MENU_VISIT_WEBSITE_CAPS", uiScript "visitWebsite", "@NULL_EMPTY", 1) MENU_CHOICE_BUTTON_VIS(11, button_11, "@MENU_MAIN_MENU_CAPS", open single_popmenu;, "@MENU_SP_DESC_SINGLEPLAYER", 1)
MENU_CHOICE_HORIZONTAL_LINE_VIS(12, 1) MENU_CHOICE_BUTTON_VIS(12, button_12, "@MENU_QUIT_CAPS", open quit_popmenu;, "@MPUI_DESC_QUIT", 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)
ITEM_BUTTON_FRIENDS(-250) ITEM_BUTTON_FRIENDS(-250)

4
iw4x/iw4x_00/ui_mp/menu_online_barracks.menu
View File

@ -73,8 +73,9 @@
exp text (localvarstring("ui_hint_text")) \ exp text (localvarstring("ui_hint_text")) \
} }
menuDef
{ {
menuDef
{
name MENU_NAME name MENU_NAME
fullscreen 1 fullscreen 1
rect 0 0 640 480 rect 0 0 640 480
@ -229,4 +230,5 @@ menuDef
ITEM_BUTTON_FRIENDS(-120) ITEM_BUTTON_FRIENDS(-120)
ITEM_BUTTON_BACK(close self;) ITEM_BUTTON_BACK(close self;)
}
} }

4
iw4x/iw4x_00/ui_mp/menu_xboxlive_lobby.menu
View File

@ -156,8 +156,9 @@
open "popup_summary"; \ open "popup_summary"; \
play CHOICE_CLICK_SOUND; play CHOICE_CLICK_SOUND;
menuDef
{ {
menuDef
{
name MENU_NAME name MENU_NAME
fullscreen 1 fullscreen 1
rect 0 0 640 480 rect 0 0 640 480
@ -260,4 +261,5 @@ menuDef
ITEM_BUTTON_SUMMARY_VIS(1) ITEM_BUTTON_SUMMARY_VIS(1)
ITEM_BUTTON_BACK(ON_MENU_ESC) ITEM_BUTTON_BACK(ON_MENU_ESC)
}
} }

1
iw4x/iw4x_00/ui_mp/menu_xboxlive_privatelobby.menu
View File

@ -8,4 +8,5 @@
{ {
open "createserver"; open "createserver";
} }
}
} }

8
iw4x/iw4x_00/ui_mp/mods_menu.menu
View File

@ -19,7 +19,7 @@
setLocalVarString ui_info_name ""; \ setLocalVarString ui_info_name ""; \
setLocalVarString ui_info_desc ""; \ setLocalVarString ui_info_desc ""; \
setLocalVarString ui_info_icon ""; \ setLocalVarString ui_info_icon ""; \
uiScript "LoadMods"; uiScript "LoadMods"; \
setFocus "modlist"; setFocus "modlist";
#define MENU_MODS_BUTTON_VIS(nameArg, yPos, textArg, actionArg, visArg) \ #define MENU_MODS_BUTTON_VIS(nameArg, yPos, textArg, actionArg, visArg) \
@ -71,8 +71,9 @@
exp rect x (posX) \ exp rect x (posX) \
} }
menuDef
{ {
menuDef
{
name MENU_NAME name MENU_NAME
fullscreen 1 fullscreen 1
rect 0 0 640 480 rect 0 0 640 480
@ -110,7 +111,7 @@ menuDef
elementWidth 120 elementWidth 120
elementHeight 22 elementHeight 22
visible 1 visible 1
// numcols xpos xwidth textlen alignment // numcols xpos xwidth textlen alignment
columns 1 8 120 25 0 columns 1 8 120 25 0
doubleClick doubleClick
{ {
@ -124,4 +125,5 @@ menuDef
MENU_MODS_BUTTON_VIS("unloadMod", -48, "@MENU_LAUNCH_WITHOUT_MODS", uiScript "ClearMods", 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;) ITEM_BUTTON_BACK(close self;)
}
} }

4
iw4x/iw4x_00/ui_mp/pc_join_unranked.menu
View File

@ -30,8 +30,9 @@
#define ON_MENU_KEY_ENTER \ #define ON_MENU_KEY_ENTER \
uiScript "JoinServer"; uiScript "JoinServer";
menuDef
{ {
menuDef
{
name MENU_NAME name MENU_NAME
fullscreen 1 fullscreen 1
rect 0 0 640 480 rect 0 0 640 480
@ -61,4 +62,5 @@ menuDef
BUTTON_FOOTER(-34, 100, "passwordenter", "@MENU_PASSWORD_CAPS", open "popup_joinpassword";) 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(86, 100, "serverinfo", "@MENU_SERVER_INFO_CAPS", open "serverinfo_popmenu";)
BUTTON_FOOTER(206, 100, "joinserver", "@MENU_JOIN_SERVER_CAPS", uiScript "JoinServer";) BUTTON_FOOTER(206, 100, "joinserver", "@MENU_JOIN_SERVER_CAPS", uiScript "JoinServer";)
}
} }

4
iw4x/iw4x_00/ui_mp/pc_options_actions.menu
View File

@ -43,8 +43,9 @@
#define ON_GPAD_USED when(dvarBool("gpad_in_use") == 1) #define ON_GPAD_USED when(dvarBool("gpad_in_use") == 1)
#define ON_GPAD_UNUSED when(dvarBool("gpad_in_use") == 0) #define ON_GPAD_UNUSED when(dvarBool("gpad_in_use") == 0)
menuDef
{ {
menuDef
{
name MENU_NAME name MENU_NAME
rect 0 0 640 480 rect 0 0 640 480
foreColor CHOICE_TEXTCOLOR foreColor CHOICE_TEXTCOLOR
@ -88,4 +89,5 @@ menuDef
PC_OPTIONS_KEYBINDSTATUS PC_OPTIONS_KEYBINDSTATUS
ITEM_BUTTON_BACK(ON_MENU_ESC) ITEM_BUTTON_BACK(ON_MENU_ESC)
}
} }

4
iw4x/iw4x_00/ui_mp/pc_options_advanced_video.menu
View File

@ -43,8 +43,9 @@
#define ON_MENU_ESC \ #define ON_MENU_ESC \
close self; close self;
menuDef
{ {
menuDef
{
name MENU_NAME name MENU_NAME
rect 0 0 640 480 rect 0 0 640 480
foreColor CHOICE_TEXTCOLOR foreColor CHOICE_TEXTCOLOR
@ -88,4 +89,5 @@ menuDef
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(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)
}
} }

4
iw4x/iw4x_00/ui_mp/pc_options_audio.menu
View File

@ -56,8 +56,9 @@
execnow "profile_menuDvarsFinish; resetViewport"; \ execnow "profile_menuDvarsFinish; resetViewport"; \
setLocalVarString ui_hint_text "@NULL_EMPTY"; setLocalVarString ui_hint_text "@NULL_EMPTY";
menuDef
{ {
menuDef
{
name MENU_NAME name MENU_NAME
rect 0 0 640 480 rect 0 0 640 480
foreColor CHOICE_TEXTCOLOR foreColor CHOICE_TEXTCOLOR
@ -81,4 +82,5 @@ menuDef
PC_OPTIONS_SEPERATOR(1) PC_OPTIONS_SEPERATOR(1)
PC_OPTIONS_DVARYESNO(2, "@MPUI_ENABLE_VOICE_CHAT", "cl_voice", ;, when(0)) PC_OPTIONS_DVARYESNO(2, "@MPUI_ENABLE_VOICE_CHAT", "cl_voice", ;, when(0))
PC_OPTIONS_KEYBINDING(3, "@MENU_VOICE_CHAT_BUTTON", "+talk") PC_OPTIONS_KEYBINDING(3, "@MENU_VOICE_CHAT_BUTTON", "+talk")
}
} }

4
iw4x/iw4x_00/ui_mp/pc_options_controls.menu
View File

@ -56,8 +56,9 @@
execnow "profile_menuDvarsFinish; resetViewport"; \ execnow "profile_menuDvarsFinish; resetViewport"; \
setLocalVarString ui_hint_text "@NULL_EMPTY"; setLocalVarString ui_hint_text "@NULL_EMPTY";
menuDef
{ {
menuDef
{
name MENU_NAME name MENU_NAME
rect 0 0 640 480 rect 0 0 640 480
foreColor CHOICE_TEXTCOLOR foreColor CHOICE_TEXTCOLOR
@ -119,4 +120,5 @@ menuDef
open "options_control_defaults"; open "options_control_defaults";
} }
} }
}
} }

4
iw4x/iw4x_00/ui_mp/pc_options_game.menu
View File

@ -54,8 +54,9 @@
execnow "profile_menuDvarsFinish; resetViewport"; \ execnow "profile_menuDvarsFinish; resetViewport"; \
setLocalVarString ui_hint_text "@NULL_EMPTY"; setLocalVarString ui_hint_text "@NULL_EMPTY";
menuDef
{ {
menuDef
{
name MENU_NAME name MENU_NAME
rect 0 0 640 480 rect 0 0 640 480
foreColor CHOICE_TEXTCOLOR foreColor CHOICE_TEXTCOLOR
@ -83,4 +84,5 @@ menuDef
PC_OPTIONS_DVARYESNO_RAW(2, "@MENU_AUTORECORD", "cl_autoRecord", ;, "@MPUI_DESC_AUTORECORD", when(0), 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_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(4, "@MENU_COLORBLIND_MODE", "r_colorBlindTeams", ;, when(0))
}
} }

4
iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu
View File

@ -80,8 +80,9 @@
execnow "bindgpbuttonsconfigs"; \ execnow "bindgpbuttonsconfigs"; \
} }
menuDef
{ {
menuDef
{
name MENU_NAME name MENU_NAME
rect 0 0 640 480 rect 0 0 640 480
foreColor CHOICE_TEXTCOLOR foreColor CHOICE_TEXTCOLOR
@ -129,4 +130,5 @@ menuDef
"@MENU_SENSITIVITY_HIGH_CAPS" SENSITIVITY_4 "5" SENSITIVITY_5 "6" SENSITIVITY_6 "@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}, "@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) ;, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED)
}
} }

4
iw4x/iw4x_00/ui_mp/pc_options_look.menu
View File

@ -40,8 +40,9 @@
#define ON_MENU_ESC \ #define ON_MENU_ESC \
close self; close self;
menuDef
{ {
menuDef
{
name MENU_NAME name MENU_NAME
rect 0 0 640 480 rect 0 0 640 480
foreColor CHOICE_TEXTCOLOR foreColor CHOICE_TEXTCOLOR
@ -89,4 +90,5 @@ menuDef
PC_OPTIONS_KEYBINDSTATUS PC_OPTIONS_KEYBINDSTATUS
ITEM_BUTTON_BACK(ON_MENU_ESC) ITEM_BUTTON_BACK(ON_MENU_ESC)
}
} }

4
iw4x/iw4x_00/ui_mp/pc_options_movement.menu
View File

@ -40,8 +40,9 @@
#define ON_MENU_ESC \ #define ON_MENU_ESC \
close self; close self;
menuDef
{ {
menuDef
{
name MENU_NAME name MENU_NAME
rect 0 0 640 480 rect 0 0 640 480
foreColor CHOICE_TEXTCOLOR foreColor CHOICE_TEXTCOLOR
@ -85,4 +86,5 @@ menuDef
PC_OPTIONS_KEYBINDSTATUS PC_OPTIONS_KEYBINDSTATUS
ITEM_BUTTON_BACK(ON_MENU_ESC) ITEM_BUTTON_BACK(ON_MENU_ESC)
}
} }

4
iw4x/iw4x_00/ui_mp/pc_options_multi.menu
View File

@ -58,8 +58,9 @@
execnow "profile_menuDvarsFinish; resetViewport"; \ execnow "profile_menuDvarsFinish; resetViewport"; \
setLocalVarString ui_hint_text "@NULL_EMPTY"; setLocalVarString ui_hint_text "@NULL_EMPTY";
menuDef
{ {
menuDef
{
name MENU_NAME name MENU_NAME
rect 0 0 640 480 rect 0 0 640 480
foreColor CHOICE_TEXTCOLOR foreColor CHOICE_TEXTCOLOR
@ -96,4 +97,5 @@ menuDef
PC_OPTIONS_DVARYESNO_RAW(6, "@MENU_STREAMFRIENDLY_UI", "ui_streamFriendly", ;, "@MPUI_DESC_STREAM_FRIENDLY_UI", when(0), 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) PC_OPTIONS_FLOATLIST_RAW(7, "@MENU_FRIENDNOTIFY", "cl_notifyFriendState", {"Always" -1 "Never" 0 "in Menu" 1}, ;, "@MPUI_DESC_FRIENDNOTIFY", when(dvarBool("ui_streamFriendly")), 1)
}
} }

4
iw4x/iw4x_00/ui_mp/pc_options_video.menu
View File

@ -67,8 +67,9 @@
execnow "profile_menuDvarsFinish; resetViewport"; \ execnow "profile_menuDvarsFinish; resetViewport"; \
setLocalVarString ui_hint_text "@NULL_EMPTY"; setLocalVarString ui_hint_text "@NULL_EMPTY";
menuDef
{ {
menuDef
{
name MENU_NAME name MENU_NAME
rect 0 0 640 480 rect 0 0 640 480
foreColor CHOICE_TEXTCOLOR foreColor CHOICE_TEXTCOLOR
@ -135,4 +136,5 @@ menuDef
close self; close self;
} }
} }
}
} }

4
iw4x/iw4x_00/ui_mp/popup_customclan.menu
View File

@ -47,8 +47,9 @@
#define ON_MENU_ESC \ #define ON_MENU_ESC \
close self; close self;
menuDef
{ {
menuDef
{
name MENU_NAME name MENU_NAME
rect POPMENU_RECT rect POPMENU_RECT
popup popup
@ -68,4 +69,5 @@ menuDef
ITEM_NAMEENTRY ITEM_NAMEENTRY
POPUP_BUTTON_FOOTER(64, "@MENU_CLOSE", close self;) POPUP_BUTTON_FOOTER(64, "@MENU_CLOSE", close self;)
}
} }

4
iw4x/iw4x_00/ui_mp/popup_customtitle.menu
View File

@ -47,8 +47,9 @@
#define ON_MENU_ESC \ #define ON_MENU_ESC \
close self; close self;
menuDef
{ {
menuDef
{
name MENU_NAME name MENU_NAME
rect POPMENU_RECT rect POPMENU_RECT
popup popup
@ -68,4 +69,5 @@ menuDef
ITEM_NAMEENTRY ITEM_NAMEENTRY
POPUP_BUTTON_FOOTER(64, "@MENU_CLOSE", close self;) POPUP_BUTTON_FOOTER(64, "@MENU_CLOSE", close self;)
}
} }

6
iw4x/iw4x_00/ui_mp/popup_friends.menu
View File

@ -26,8 +26,9 @@
#define ON_EXEC_KEY_F \ #define ON_EXEC_KEY_F \
escape self; escape self;
menuDef
{ {
menuDef
{
name MENU_NAME name MENU_NAME
rect POPMENU_RECT rect POPMENU_RECT
popup popup
@ -60,7 +61,7 @@ menuDef
textScale .25 textScale .25
feeder 61 feeder 61
visible 1 visible 1
// numcols xpos xwidth textlen alignment // numcols xpos xwidth textlen alignment
columns 3 8 16 4 0 columns 3 8 16 4 0
42 178 51 0 42 178 51 0
226 263 52 0 226 263 52 0
@ -70,4 +71,5 @@ menuDef
} }
} }
POPUP_BUTTON_FOOTER(350, "@MENU_CLOSE", close self;) POPUP_BUTTON_FOOTER(350, "@MENU_CLOSE", close self;)
}
} }

5
iw4x/iw4x_00/ui_mp/popup_joinpassword.menu
View File

@ -47,8 +47,10 @@
#define ON_MENU_ESC \ #define ON_MENU_ESC \
close self; close self;
menuDef
{ {
menuDef
{
name MENU_NAME name MENU_NAME
rect POPMENU_RECT rect POPMENU_RECT
popup popup
@ -68,4 +70,5 @@ menuDef
ITEM_PASSWORDENTRY ITEM_PASSWORDENTRY
POPUP_BUTTON_FOOTER(64, "@MENU_OK", close self;) POPUP_BUTTON_FOOTER(64, "@MENU_OK", close self;)
}
} }

4
iw4x/iw4x_00/ui_mp/popup_playername.menu
View File

@ -49,8 +49,9 @@
#define ON_MENU_ESC \ #define ON_MENU_ESC \
close self; close self;
menuDef
{ {
menuDef
{
name MENU_NAME name MENU_NAME
rect POPMENU_RECT rect POPMENU_RECT
popup popup
@ -70,4 +71,5 @@ menuDef
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;)
}
} }

4
iw4x/iw4x_00/ui_mp/popup_serverpassword.menu
View File

@ -49,8 +49,9 @@
#define ON_MENU_ESC \ #define ON_MENU_ESC \
close self; close self;
menuDef
{ {
menuDef
{
name MENU_NAME name MENU_NAME
rect POPMENU_RECT rect POPMENU_RECT
popup popup
@ -70,4 +71,5 @@ menuDef
ITEM_PASSWORDENTRY ITEM_PASSWORDENTRY
POPUP_BUTTON_FOOTER(64, "@MENU_OK", close self;) POPUP_BUTTON_FOOTER(64, "@MENU_OK", close self;)
}
} }

2
iw4x/iw4x_00/ui_mp/scriptmenus/changegametype.menu
View File

@ -81,7 +81,7 @@
elementtype LISTBOX_TEXT elementtype LISTBOX_TEXT
elementwidth 120 elementwidth 120
elementheight 24 elementheight 24
columns 1 2 190 25 columns 1 2 190 25 0
mouseEnter mouseEnter
{ {
setitemcolor "maplist2"; setitemcolor "maplist2";

2
iw4x/iw4x_00/ui_mp/scriptmenus/changemap.menu
View File

@ -83,7 +83,7 @@
bordercolor 1 1 1 0.15 bordercolor 1 1 1 0.15
outlinecolor 1 1 1 0.2 outlinecolor 1 1 1 0.2
feeder FEEDER_ALLMAPS feeder FEEDER_ALLMAPS
columns 1 2 190 25 columns 1 2 190 25 0
mouseEnter mouseEnter
{ {
setitemcolor "maplist"; setitemcolor "maplist";

2
iw4x/iw4x_00/ui_mp/scriptmenus/kickplayer.menu
View File

@ -80,7 +80,7 @@
bordercolor 1 1 1 0.15 bordercolor 1 1 1 0.15
outlinecolor 1 1 1 0.2 outlinecolor 1 1 1 0.2
feeder FEEDER_PLAYER_LIST feeder FEEDER_PLAYER_LIST
columns 1 2 190 25 columns 1 2 190 25 0
mouseEnter mouseEnter
{ {
setitemcolor "maplist"; setitemcolor "maplist";

108
iw4x/iw4x_00/ui_mp/serverinfo_popmenu.menu
View File

@ -109,58 +109,6 @@
#define SV_INFO_TABLE_WIDTH 496 #define SV_INFO_TABLE_WIDTH 496
#define SV_INFO_TABLE_HEIGHT 160 #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 KEYINT_F5 171
#define POPMENU_POS_X -250 #define POPMENU_POS_X -250
@ -184,9 +132,10 @@
#define ON_KEY_PRESS_F5 \ #define ON_KEY_PRESS_F5 \
uiScript "ServerStatus"; uiScript "ServerStatus";
menuDef
{ {
name MENU_NAME menuDef
{
name "serverinfo_popmenu"
rect POPMENU_RECT rect POPMENU_RECT
popup popup
legacySplitScreenScale legacySplitScreenScale
@ -215,7 +164,53 @@ menuDef
SV_INFO_SECURITY_LEVEL_VIS(6, 1) SV_INFO_SECURITY_LEVEL_VIS(6, 1)
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
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 itemDef
{ {
@ -234,7 +229,7 @@ menuDef
elementHeight 16 elementHeight 16
notselectable notselectable
visible 1 visible 1
// numcols xpos xwidth textlen alignment // numcols xpos xwidth textlen alignment
columns 4 8 2 2 0 columns 4 8 2 2 0
80 16 16 0 80 16 16 0
345 4 4 0 345 4 4 0
@ -243,4 +238,5 @@ menuDef
POPUP_BUTTON_FOOTER(330, "@PLATFORM_REFRESH", uiScript "ServerStatus";) POPUP_BUTTON_FOOTER(330, "@PLATFORM_REFRESH", uiScript "ServerStatus";)
POPUP_BUTTON_FOOTER(350, "@MENU_CLOSE", close self;) POPUP_BUTTON_FOOTER(350, "@MENU_CLOSE", close self;)
}
} }

21
iw4x/iw4x_00/ui_mp/settings_gametype.menu
View File

@ -56,7 +56,6 @@
textScale 0.55 textScale 0.55
textStyle 0 textStyle 0
textFont 0 textFont 0
feeder 0
visible 1 visible 1
} }
itemDef itemDef
@ -81,7 +80,6 @@
textScale 0.55 textScale 0.55
textStyle 0 textStyle 0
textFont 0 textFont 0
feeder 0
visible 1 visible 1
exp rect x ( ( 0 - 107 ) - ( ( float( milliseconds( ) % 60000 ) / 60000 ) * ( 854 ) ) ) exp rect x ( ( 0 - 107 ) - ( ( float( milliseconds( ) % 60000 ) / 60000 ) * ( 854 ) ) )
} }
@ -107,7 +105,6 @@
textScale 0.55 textScale 0.55
textStyle 0 textStyle 0
textFont 0 textFont 0
feeder 0
visible 1 visible 1
exp rect x ( ( - 107 + 854 ) + ( ( float( milliseconds( ) % 50000 ) / 50000 ) * ( 854 ) ) ) exp rect x ( ( - 107 + 854 ) + ( ( float( milliseconds( ) % 50000 ) / 50000 ) * ( 854 ) ) )
} }
@ -133,7 +130,6 @@
textScale 0.55 textScale 0.55
textStyle 0 textStyle 0
textFont 0 textFont 0
feeder 0
visible 1 visible 1
exp forecolor a ( ( ( ( sin milliseconds( ) / 1500 ) + 1 ) * 0.250000 ) + 0.250000 ) exp forecolor a ( ( ( ( sin milliseconds( ) / 1500 ) + 1 ) * 0.250000 ) + 0.250000 )
} }
@ -159,7 +155,6 @@
textScale 0.55 textScale 0.55
textStyle 0 textStyle 0
textFont 0 textFont 0
feeder 0
visible 1 visible 1
exp forecolor a ( ( ( ( sin milliseconds( ) / 480 ) + 1 ) * 0.250000 ) + 0.250000 ) exp forecolor a ( ( ( ( sin milliseconds( ) / 480 ) + 1 ) * 0.250000 ) + 0.250000 )
} }
@ -184,7 +179,6 @@
textScale 0.44 textScale 0.44
textStyle 0 textStyle 0
textFont 9 textFont 9
feeder 0
text "@MENU_CHOOSE_GAME_MODE_CAP" text "@MENU_CHOOSE_GAME_MODE_CAP"
visible 1 visible 1
} }
@ -210,7 +204,6 @@
textScale 0.55 textScale 0.55
textStyle 0 textStyle 0
textFont 0 textFont 0
feeder 0
visible 1 visible 1
} }
itemDef itemDef
@ -235,7 +228,6 @@
textScale 0.55 textScale 0.55
textStyle 0 textStyle 0
textFont 0 textFont 0
feeder 0
visible 1 visible 1
} }
itemDef itemDef
@ -260,7 +252,6 @@
textScale 0.55 textScale 0.55
textStyle 0 textStyle 0
textFont 0 textFont 0
feeder 0
visible 1 visible 1
} }
itemDef itemDef
@ -285,7 +276,6 @@
textScale 0.55 textScale 0.55
textStyle 0 textStyle 0
textFont 0 textFont 0
feeder 0
visible 1 visible 1
} }
itemDef itemDef
@ -310,7 +300,6 @@
textScale 0.55 textScale 0.55
textStyle 0 textStyle 0
textFont 0 textFont 0
feeder 0
visible 1 visible 1
} }
itemDef itemDef
@ -335,7 +324,6 @@
textScale 0.55 textScale 0.55
textStyle 0 textStyle 0
textFont 0 textFont 0
feeder 0
visible 1 visible 1
} }
itemDef itemDef
@ -360,7 +348,6 @@
textScale 0.55 textScale 0.55
textStyle 0 textStyle 0
textFont 0 textFont 0
feeder 0
visible 1 visible 1
} }
itemDef itemDef
@ -385,7 +372,6 @@
textScale 0.55 textScale 0.55
textStyle 0 textStyle 0
textFont 0 textFont 0
feeder 0
visible 1 visible 1
} }
itemDef itemDef
@ -410,7 +396,6 @@
textScale 0.55 textScale 0.55
textStyle 0 textStyle 0
textFont 0 textFont 0
feeder 0
visible 1 visible 1
} }
@ -445,7 +430,6 @@
textScale 0.375 \ textScale 0.375 \
textStyle 0 \ textStyle 0 \
textFont 3 \ textFont 3 \
feeder 0 \
visible 1 \ visible 1 \
visible visArg \ visible visArg \
exp text ( "@" + tablelookup( "mp/gameTypesTable.csv" , 0 , textArg , 1 ) + "_CAPS" ) \ exp text ( "@" + tablelookup( "mp/gameTypesTable.csv" , 0 , textArg , 1 ) + "_CAPS" ) \
@ -502,7 +486,6 @@
textStyle 0 \ textStyle 0 \
textFont 3 \ textFont 3 \
text textArg \ text textArg \
feeder 0 \
visible 1 \ visible 1 \
visible visArg \ visible visArg \
onFocus \ onFocus \
@ -617,7 +600,6 @@
textScale 0.375 textScale 0.375
textStyle 0 textStyle 0
textFont 3 textFont 3
feeder 0
text "@PLATFORM_BACK_CAPS" text "@PLATFORM_BACK_CAPS"
visible 1 visible 1
onFocus onFocus
@ -659,7 +641,6 @@
textScale 0.55 textScale 0.55
textStyle 0 textStyle 0
textFont 0 textFont 0
feeder 0
visible 1 visible 1
} }
itemDef itemDef
@ -683,7 +664,6 @@
textScale 0.375 textScale 0.375
textStyle 0 textStyle 0
textFont 9 textFont 9
feeder 0
visible 1 visible 1
exp text ( localvarstring( "ui_info_name" ) ) exp text ( localvarstring( "ui_info_name" ) )
} }
@ -709,7 +689,6 @@
textScale 0.375 textScale 0.375
textStyle 0 textStyle 0
textFont 3 textFont 3
feeder 0
visible 1 visible 1
exp text ( localvarstring( "ui_info_desc" ) ) exp text ( localvarstring( "ui_info_desc" ) )
} }

6
iw4x/iw4x_00/ui_mp/theater_menu.menu
View File

@ -211,8 +211,9 @@
#define ON_MENU_ESC \ #define ON_MENU_ESC \
close self; close self;
menuDef
{ {
menuDef
{
name MENU_NAME name MENU_NAME
fullscreen 1 fullscreen 1
rect 0 0 640 480 rect 0 0 640 480
@ -249,7 +250,7 @@ menuDef
feeder FEEDER_DEMOS feeder FEEDER_DEMOS
elementWidth 260 elementWidth 260
elementHeight 16 elementHeight 16
// numcols xpos xwidth textlen alignment // numcols xpos xwidth textlen alignment
columns 1 8 260 80 0 columns 1 8 260 80 0
doubleClick doubleClick
{ {
@ -262,4 +263,5 @@ menuDef
} }
ITEM_BUTTON_BACK(close self;) ITEM_BUTTON_BACK(close self;)
}
} }