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

fix: format

pull/3/head
FutureRave 2023-03-18 10:51:23 +00:00
parent 028edf6e00
commit 20d5c0cb0f
No known key found for this signature in database
GPG Key ID: 22F9079C86CFAB31
7 changed files with 83 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
iw4x/iw4x_00/maps/mp/gametypes/_gamelogic.gsc
View File

@ -555,7 +555,7 @@ updateWinLossStats( winner )
updateTieStats( player ); updateTieStats( player );
} }
} }
else if ( isPlayer( winner ) ) else if ( isPlayer( winner ) )
{ {
if ( level.hostForcedEnd && winner isHost() ) if ( level.hostForcedEnd && winner isHost() )

2
iw4x/iw4x_00/ui/choices_setup_common.menu
View File

@ -376,7 +376,7 @@
forecolor 1 1 1 1 \ 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 && vis ); \
decoration \ decoration \
} }
#else // #if defined( CONSOLE ) && !defined( SPLITSCREEN ) #else // #if defined( CONSOLE ) && !defined( SPLITSCREEN )
#define CHOICE_ACCEPT_HINT( itemIndex, vis ) #define CHOICE_ACCEPT_HINT( itemIndex, vis )
#endif // #else // #if defined( CONSOLE ) && !defined( SPLITSCREEN ) #endif // #else // #if defined( CONSOLE ) && !defined( SPLITSCREEN )

4
iw4x/iw4x_00/ui/choices_setup_popmenu.menu
View File

@ -280,7 +280,7 @@
forecolor CHOICE_POPUP_BACKCOLOR \ forecolor CHOICE_POPUP_BACKCOLOR \
visible 1 \ visible 1 \
decoration \ decoration \
} }
#else #else
#define CENTER_POPUP_SETUP_RAW( nameArg, itemCount, onEscArg, onOpenArg, extraArgs, shadow_visArg ) \ #define CENTER_POPUP_SETUP_RAW( nameArg, itemCount, onEscArg, onOpenArg, extraArgs, shadow_visArg ) \
name nameArg \ name nameArg \
@ -319,7 +319,7 @@
forecolor CHOICE_POPUP_BACKCOLOR \ forecolor CHOICE_POPUP_BACKCOLOR \
visible 1 \ visible 1 \
decoration \ decoration \
} }
#endif #endif
#ifdef PUBLIC_BETA #ifdef PUBLIC_BETA

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

@ -83,12 +83,12 @@
elementheight 24 elementheight 24
columns 1 2 190 25 columns 1 2 190 25
mouseEnter mouseEnter
{ {
setitemcolor "maplist2"; setitemcolor "maplist2";
bordercolor 1 1 1 0.55; bordercolor 1 1 1 0.55;
} }
mouseExit mouseExit
{ {
setitemcolor "maplist2"; setitemcolor "maplist2";
bordercolor 1 1 1 0.15; bordercolor 1 1 1 0.15;
} }

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

@ -85,12 +85,12 @@
feeder FEEDER_ALLMAPS feeder FEEDER_ALLMAPS
columns 1 2 190 25 columns 1 2 190 25
mouseEnter mouseEnter
{ {
setitemcolor "maplist"; setitemcolor "maplist";
bordercolor 1 1 1 0.55; bordercolor 1 1 1 0.55;
} }
mouseExit mouseExit
{ {
setitemcolor "maplist"; setitemcolor "maplist";
bordercolor 1 1 1 0.15; bordercolor 1 1 1 0.15;
} }

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

@ -82,12 +82,12 @@
feeder FEEDER_PLAYER_LIST feeder FEEDER_PLAYER_LIST
columns 1 2 190 25 columns 1 2 190 25
mouseEnter mouseEnter
{ {
setitemcolor "maplist"; setitemcolor "maplist";
bordercolor 1 1 1 0.55; bordercolor 1 1 1 0.55;
} }
mouseExit mouseExit
{ {
setitemcolor "maplist"; setitemcolor "maplist";
bordercolor 1 1 1 0.15; bordercolor 1 1 1 0.15;
} }

142
iw4x/iw4x_00/ui_mp/settings_map.menu
View File

@ -72,7 +72,7 @@
#undef CHOICE_TEXTCOLOR #undef CHOICE_TEXTCOLOR
#define CHOICE_TEXTCOLOR 0.5 1 0.5 1 #define CHOICE_TEXTCOLOR 0.5 1 0.5 1
CHOICE_BUTTON_FOCUS(0, "dlc_list_1", "@MP_ORIGINAL_MAPS", setdvar "iw4x_maps_dlc" 0;, LOCAL_MAP_FOCUS( "MP_ORIGINAL_MAPS", "NULL_EMPTY", "loadscreen_mp_bonusmaps" ), ; ) CHOICE_BUTTON_FOCUS(0, "dlc_list_1", "@MP_ORIGINAL_MAPS", setdvar "iw4x_maps_dlc" 0;, LOCAL_MAP_FOCUS( "MP_ORIGINAL_MAPS", "NULL_EMPTY", "loadscreen_mp_bonusmaps" ), ;)
CHOICE_BUTTON_FOCUS(1, "dlc_list_2", "@PATCH_DLC1", setdvar "iw4x_maps_dlc" 1;, LOCAL_MAP_FOCUS( "PATCH_DLC1", "PATCH_DESC_DLC1", "preview_stimulus_dlc" ), 1) CHOICE_BUTTON_FOCUS(1, "dlc_list_2", "@PATCH_DLC1", setdvar "iw4x_maps_dlc" 1;, LOCAL_MAP_FOCUS( "PATCH_DLC1", "PATCH_DESC_DLC1", "preview_stimulus_dlc" ), 1)
CHOICE_BUTTON_FOCUS(2, "dlc_list_3", "@PATCH_DLC2", setdvar "iw4x_maps_dlc" 2;, LOCAL_MAP_FOCUS( "PATCH_DLC2", "PATCH_DESC_DLC2", "preview_resurgence_dlc" ), 1) CHOICE_BUTTON_FOCUS(2, "dlc_list_3", "@PATCH_DLC2", setdvar "iw4x_maps_dlc" 2;, LOCAL_MAP_FOCUS( "PATCH_DLC2", "PATCH_DESC_DLC2", "preview_resurgence_dlc" ), 1)
CHOICE_BUTTON_FOCUS(3, "dlc_list_4", "@PATCH_IW4X_DLC", setdvar "iw4x_maps_dlc" 3;, LOCAL_MAP_FOCUS( "PATCH_IW4X_DLC", "PATCH_DESC_IW4X_DLC", "preview_codo_dlc" ), 1) CHOICE_BUTTON_FOCUS(3, "dlc_list_4", "@PATCH_IW4X_DLC", setdvar "iw4x_maps_dlc" 3;, LOCAL_MAP_FOCUS( "PATCH_IW4X_DLC", "PATCH_DESC_IW4X_DLC", "preview_codo_dlc" ), 1)
@ -80,74 +80,74 @@
CHOICE_BUTTON_FOCUS(5, "dlc_list_6", "@PATCH_MW3_DLC", setdvar "iw4x_maps_dlc" 5;, LOCAL_MAP_FOCUS( "PATCH_MW3_DLC", "PATCH_DESC_MW3_DLC", "preview_mw3_dlc" ), 1) CHOICE_BUTTON_FOCUS(5, "dlc_list_6", "@PATCH_MW3_DLC", setdvar "iw4x_maps_dlc" 5;, LOCAL_MAP_FOCUS( "PATCH_MW3_DLC", "PATCH_DESC_MW3_DLC", "preview_mw3_dlc" ), 1)
CHOICE_BUTTON_FOCUS(6, "dlc_list_custom", "@CUSTOM_MAPS_DLC", setdvar "iw4x_maps_dlc" 99;, LOCAL_MAP_FOCUS( "CUSTOM_MAPS_DLC", "DESC_CUSTOM_MAPS_DLC", "preview_custom_maps" ), 1) CHOICE_BUTTON_FOCUS(6, "dlc_list_custom", "@CUSTOM_MAPS_DLC", setdvar "iw4x_maps_dlc" 99;, LOCAL_MAP_FOCUS( "CUSTOM_MAPS_DLC", "DESC_CUSTOM_MAPS_DLC", "preview_custom_maps" ), 1)
LOCAL_MAP_SELECTION( 0, "mp_afghan", "MPUI_AFGHAN", "MPUI_DESC_MAP_AFGHAN", "preview_mp_afghan", dvarint("iw4x_maps_dlc") == 0) LOCAL_MAP_SELECTION(0, "mp_afghan", "MPUI_AFGHAN", "MPUI_DESC_MAP_AFGHAN", "preview_mp_afghan", dvarint("iw4x_maps_dlc") == 0)
LOCAL_MAP_SELECTION( 1, "mp_derail", "MPUI_DERAIL", "MPUI_DESC_MAP_DERAIL", "preview_mp_derail", dvarint("iw4x_maps_dlc") == 0) LOCAL_MAP_SELECTION(1, "mp_derail", "MPUI_DERAIL", "MPUI_DESC_MAP_DERAIL", "preview_mp_derail", dvarint("iw4x_maps_dlc") == 0)
LOCAL_MAP_SELECTION( 2, "mp_estate", "MPUI_ESTATE", "MPUI_DESC_MAP_ESTATE", "preview_mp_estate", dvarint("iw4x_maps_dlc") == 0) LOCAL_MAP_SELECTION(2, "mp_estate", "MPUI_ESTATE", "MPUI_DESC_MAP_ESTATE", "preview_mp_estate", dvarint("iw4x_maps_dlc") == 0)
LOCAL_MAP_SELECTION( 3, "mp_favela", "MPUI_FAVELA", "MPUI_DESC_MAP_FAVELA", "preview_mp_favela", dvarint("iw4x_maps_dlc") == 0) LOCAL_MAP_SELECTION(3, "mp_favela", "MPUI_FAVELA", "MPUI_DESC_MAP_FAVELA", "preview_mp_favela", dvarint("iw4x_maps_dlc") == 0)
LOCAL_MAP_SELECTION( 4, "mp_highrise", "MPUI_HIGHRISE", "MPUI_DESC_MAP_HIGHRISE", "preview_mp_highrise", dvarint("iw4x_maps_dlc") == 0) LOCAL_MAP_SELECTION(4, "mp_highrise", "MPUI_HIGHRISE", "MPUI_DESC_MAP_HIGHRISE", "preview_mp_highrise", dvarint("iw4x_maps_dlc") == 0)
LOCAL_MAP_SELECTION( 5, "mp_invasion", "MPUI_INVASION", "MPUI_DESC_MAP_INVASION", "preview_mp_invasion", dvarint("iw4x_maps_dlc") == 0) LOCAL_MAP_SELECTION(5, "mp_invasion", "MPUI_INVASION", "MPUI_DESC_MAP_INVASION", "preview_mp_invasion", dvarint("iw4x_maps_dlc") == 0)
LOCAL_MAP_SELECTION( 6, "mp_checkpoint", "MPUI_CHECKPOINT", "MPUI_DESC_MAP_CHECKPOINT", "preview_mp_checkpoint", dvarint("iw4x_maps_dlc") == 0) LOCAL_MAP_SELECTION(6, "mp_checkpoint", "MPUI_CHECKPOINT", "MPUI_DESC_MAP_CHECKPOINT", "preview_mp_checkpoint", dvarint("iw4x_maps_dlc") == 0)
LOCAL_MAP_SELECTION( 7, "mp_quarry", "MPUI_QUARRY", "MPUI_DESC_MAP_QUARRY", "preview_mp_quarry", dvarint("iw4x_maps_dlc") == 0) LOCAL_MAP_SELECTION(7, "mp_quarry", "MPUI_QUARRY", "MPUI_DESC_MAP_QUARRY", "preview_mp_quarry", dvarint("iw4x_maps_dlc") == 0)
LOCAL_MAP_SELECTION( 8, "mp_rundown", "MPUI_RUNDOWN", "MPUI_DESC_MAP_RUNDOWN", "preview_mp_rundown", dvarint("iw4x_maps_dlc") == 0) LOCAL_MAP_SELECTION(8, "mp_rundown", "MPUI_RUNDOWN", "MPUI_DESC_MAP_RUNDOWN", "preview_mp_rundown", dvarint("iw4x_maps_dlc") == 0)
LOCAL_MAP_SELECTION( 9, "mp_rust", "MPUI_RUST", "MPUI_DESC_MAP_RUST", "preview_mp_rust", dvarint("iw4x_maps_dlc") == 0) LOCAL_MAP_SELECTION(9, "mp_rust", "MPUI_RUST", "MPUI_DESC_MAP_RUST", "preview_mp_rust", dvarint("iw4x_maps_dlc") == 0)
LOCAL_MAP_SELECTION( 10, "mp_boneyard", "MPUI_BONEYARD", "MPUI_DESC_MAP_BONEYARD", "preview_mp_boneyard", dvarint("iw4x_maps_dlc") == 0) LOCAL_MAP_SELECTION(10, "mp_boneyard", "MPUI_BONEYARD", "MPUI_DESC_MAP_BONEYARD", "preview_mp_boneyard", dvarint("iw4x_maps_dlc") == 0)
LOCAL_MAP_SELECTION( 11, "mp_skidrow", "MPUI_RAID", "MPUI_DESC_MAP_NIGHTSHIFT", "preview_mp_nightshift", dvarint("iw4x_maps_dlc") == 0) LOCAL_MAP_SELECTION(11, "mp_skidrow", "MPUI_RAID", "MPUI_DESC_MAP_NIGHTSHIFT", "preview_mp_nightshift", dvarint("iw4x_maps_dlc") == 0)
LOCAL_MAP_SELECTION( 12, "mp_subbase", "MPUI_SUBBASE", "MPUI_DESC_MAP_SUBBASE", "preview_mp_subbase", dvarint("iw4x_maps_dlc") == 0) LOCAL_MAP_SELECTION(12, "mp_subbase", "MPUI_SUBBASE", "MPUI_DESC_MAP_SUBBASE", "preview_mp_subbase", dvarint("iw4x_maps_dlc") == 0)
LOCAL_MAP_SELECTION( 13, "mp_terminal", "MPUI_TERMINAL", "MPUI_DESC_MAP_TERMINAL", "preview_mp_terminal", dvarint("iw4x_maps_dlc") == 0) LOCAL_MAP_SELECTION(13, "mp_terminal", "MPUI_TERMINAL", "MPUI_DESC_MAP_TERMINAL", "preview_mp_terminal", dvarint("iw4x_maps_dlc") == 0)
LOCAL_MAP_SELECTION( 14, "mp_underpass", "MPUI_UNDERPASS", "MPUI_DESC_MAP_UNDERPASS", "preview_mp_underpass", dvarint("iw4x_maps_dlc") == 0) LOCAL_MAP_SELECTION(14, "mp_underpass", "MPUI_UNDERPASS", "MPUI_DESC_MAP_UNDERPASS", "preview_mp_underpass", dvarint("iw4x_maps_dlc") == 0)
LOCAL_MAP_SELECTION( 15, "mp_brecourt", "MPUI_WASTELAND", "MPUI_DESC_MAP_BRECOURT", "preview_mp_brecourt", dvarint("iw4x_maps_dlc") == 0) LOCAL_MAP_SELECTION(15, "mp_brecourt", "MPUI_WASTELAND", "MPUI_DESC_MAP_BRECOURT", "preview_mp_brecourt", dvarint("iw4x_maps_dlc") == 0)
LOCAL_MAP_SELECTION( 0, "mp_complex", "PATCH_COMPLEX", "PATCH_DESC_MAP_COMPLEX", "preview_mp_complex", dvarint("iw4x_maps_dlc") == 1) LOCAL_MAP_SELECTION(0, "mp_complex", "PATCH_COMPLEX", "PATCH_DESC_MAP_COMPLEX", "preview_mp_complex", dvarint("iw4x_maps_dlc") == 1)
LOCAL_MAP_SELECTION( 1, "mp_crash", "MPUI_CRASH", "MPUI_DESC_MAP_CRASH", "preview_mp_crash", dvarint("iw4x_maps_dlc") == 1) LOCAL_MAP_SELECTION(1, "mp_crash", "MPUI_CRASH", "MPUI_DESC_MAP_CRASH", "preview_mp_crash", dvarint("iw4x_maps_dlc") == 1)
LOCAL_MAP_SELECTION( 2, "mp_overgrown", "MPUI_OVERGROWN", "MPUI_DESC_MAP_OVERGROWN", "preview_mp_overgrown", dvarint("iw4x_maps_dlc") == 1) LOCAL_MAP_SELECTION(2, "mp_overgrown", "MPUI_OVERGROWN", "MPUI_DESC_MAP_OVERGROWN", "preview_mp_overgrown", dvarint("iw4x_maps_dlc") == 1)
LOCAL_MAP_SELECTION( 3, "mp_compact", "PATCH_COMPACT", "PATCH_DESC_MAP_COMPACT", "preview_mp_compact", dvarint("iw4x_maps_dlc") == 1) LOCAL_MAP_SELECTION(3, "mp_compact", "PATCH_COMPACT", "PATCH_DESC_MAP_COMPACT", "preview_mp_compact", dvarint("iw4x_maps_dlc") == 1)
LOCAL_MAP_SELECTION( 4, "mp_storm", "PATCH_STORM", "PATCH_DESC_MAP_STORM", "preview_mp_storm", dvarint("iw4x_maps_dlc") == 1) LOCAL_MAP_SELECTION(4, "mp_storm", "PATCH_STORM", "PATCH_DESC_MAP_STORM", "preview_mp_storm", dvarint("iw4x_maps_dlc") == 1)
LOCAL_MAP_SELECTION( 0, "mp_abandon", "PATCH_ABANDON", "PATCH_DESC_MAP_ABANDON", "preview_mp_abandon", dvarint("iw4x_maps_dlc") == 2) LOCAL_MAP_SELECTION(0, "mp_abandon", "PATCH_ABANDON", "PATCH_DESC_MAP_ABANDON", "preview_mp_abandon", dvarint("iw4x_maps_dlc") == 2)
LOCAL_MAP_SELECTION( 1, "mp_fuel2", "PATCH_FUEL2", "PATCH_DESC_MAP_FUEL2", "preview_mp_fuel2", dvarint("iw4x_maps_dlc") == 2) LOCAL_MAP_SELECTION(1, "mp_fuel2", "PATCH_FUEL2", "PATCH_DESC_MAP_FUEL2", "preview_mp_fuel2", dvarint("iw4x_maps_dlc") == 2)
LOCAL_MAP_SELECTION( 2, "mp_strike", "PATCH_STRIKE", "MPUI_DESC_MAP_STRIKE", "preview_mp_strike", dvarint("iw4x_maps_dlc") == 2) LOCAL_MAP_SELECTION(2, "mp_strike", "PATCH_STRIKE", "MPUI_DESC_MAP_STRIKE", "preview_mp_strike", dvarint("iw4x_maps_dlc") == 2)
LOCAL_MAP_SELECTION( 3, "mp_trailerpark", "PATCH_TRAILERPARK", "PATCH_DESC_MAP_TRAILERPARK", "preview_mp_trailerpark", dvarint("iw4x_maps_dlc") == 2) LOCAL_MAP_SELECTION(3, "mp_trailerpark", "PATCH_TRAILERPARK", "PATCH_DESC_MAP_TRAILERPARK", "preview_mp_trailerpark", dvarint("iw4x_maps_dlc") == 2)
LOCAL_MAP_SELECTION( 4, "mp_vacant", "PATCH_VACANT", "MPUI_DESC_MAP_VACANT", "preview_mp_vacant", dvarint("iw4x_maps_dlc") == 2) LOCAL_MAP_SELECTION(4, "mp_vacant", "PATCH_VACANT", "MPUI_DESC_MAP_VACANT", "preview_mp_vacant", dvarint("iw4x_maps_dlc") == 2)
LOCAL_MAP_SELECTION( 0, "mp_nuked", "MPUI_NUKED", "MPUI_DESC_MAP_NUKED", "preview_mp_nuked", dvarint("iw4x_maps_dlc") == 3) LOCAL_MAP_SELECTION(0, "mp_nuked", "MPUI_NUKED", "MPUI_DESC_MAP_NUKED", "preview_mp_nuked", dvarint("iw4x_maps_dlc") == 3)
LOCAL_MAP_SELECTION( 1, "mp_cross_fire", "MPUI_CROSSFIRE", "MPUI_DESC_MAP_CROSSFIRE", "preview_mp_cross_fire", dvarint("iw4x_maps_dlc") == 3) LOCAL_MAP_SELECTION(1, "mp_cross_fire", "MPUI_CROSSFIRE", "MPUI_DESC_MAP_CROSSFIRE", "preview_mp_cross_fire", dvarint("iw4x_maps_dlc") == 3)
LOCAL_MAP_SELECTION( 2, "mp_cargoship", "MPUI_CARGOSHIP", "MPUI_DESC_MAP_CARGOSHIP", "preview_mp_cargoship", dvarint("iw4x_maps_dlc") == 3) LOCAL_MAP_SELECTION(2, "mp_cargoship", "MPUI_CARGOSHIP", "MPUI_DESC_MAP_CARGOSHIP", "preview_mp_cargoship", dvarint("iw4x_maps_dlc") == 3)
LOCAL_MAP_SELECTION( 3, "mp_bloc_sh", "MPUI_BLOC_SH", "MPUI_DESC_MAP_BLOC_SH", "preview_mp_bloc_sh", dvarint("iw4x_maps_dlc") == 3) LOCAL_MAP_SELECTION(3, "mp_bloc_sh", "MPUI_BLOC_SH", "MPUI_DESC_MAP_BLOC_SH", "preview_mp_bloc_sh", dvarint("iw4x_maps_dlc") == 3)
LOCAL_MAP_SELECTION( 4, "mp_killhouse", "MPUI_KILLHOUSE", "MPUI_DESC_MAP_KILLHOUSE", "preview_mp_killhouse", dvarint("iw4x_maps_dlc") == 3) LOCAL_MAP_SELECTION(4, "mp_killhouse", "MPUI_KILLHOUSE", "MPUI_DESC_MAP_KILLHOUSE", "preview_mp_killhouse", dvarint("iw4x_maps_dlc") == 3)
LOCAL_MAP_SELECTION( 5, "mp_bog", "MPUI_BOG_SH", "MPUI_DESC_MAP_BOG", "preview_mp_bog_sh", dvarint("iw4x_maps_dlc") == 3) LOCAL_MAP_SELECTION(5, "mp_bog", "MPUI_BOG_SH", "MPUI_DESC_MAP_BOG", "preview_mp_bog_sh", dvarint("iw4x_maps_dlc") == 3)
LOCAL_MAP_SELECTION( 6, "mp_cargoship_sh", "MPUI_CARGOSHIP_SH", "MPUI_DESC_MAP_CARGOSHIP_SH", "preview_mp_cargoship_sh", dvarint("iw4x_maps_dlc") == 3) LOCAL_MAP_SELECTION(6, "mp_cargoship_sh", "MPUI_CARGOSHIP_SH", "MPUI_DESC_MAP_CARGOSHIP_SH", "preview_mp_cargoship_sh", dvarint("iw4x_maps_dlc") == 3)
LOCAL_MAP_SELECTION( 7, "mp_shipment", "MPUI_SHIPMENT", "MPUI_DESC_MAP_SHIPMENT", "preview_mp_shipment", dvarint("iw4x_maps_dlc") == 3) LOCAL_MAP_SELECTION(7, "mp_shipment", "MPUI_SHIPMENT", "MPUI_DESC_MAP_SHIPMENT", "preview_mp_shipment", dvarint("iw4x_maps_dlc") == 3)
LOCAL_MAP_SELECTION( 8, "mp_shipment_long", "MPUI_SHIPMENT_LONG", "MPUI_DESC_MAP_SHIPMENT_LONG", "preview_mp_shipment_long", dvarint("iw4x_maps_dlc") == 3) LOCAL_MAP_SELECTION(8, "mp_shipment_long", "MPUI_SHIPMENT_LONG", "MPUI_DESC_MAP_SHIPMENT_LONG", "preview_mp_shipment_long", dvarint("iw4x_maps_dlc") == 3)
LOCAL_MAP_SELECTION( 9, "mp_rust_long", "MPUI_RUST_LONG", "MPUI_DESC_MAP_RUST_LONG", "preview_mp_rust_long", dvarint("iw4x_maps_dlc") == 3) LOCAL_MAP_SELECTION(9, "mp_rust_long", "MPUI_RUST_LONG", "MPUI_DESC_MAP_RUST_LONG", "preview_mp_rust_long", dvarint("iw4x_maps_dlc") == 3)
LOCAL_MAP_SELECTION( 10, "mp_firingrange", "MPUI_FIRINGRANGE", "MPUI_DESC_MAP_FIRINGRANGE", "preview_mp_firingrange", dvarint("iw4x_maps_dlc") == 3) LOCAL_MAP_SELECTION(10, "mp_firingrange", "MPUI_FIRINGRANGE", "MPUI_DESC_MAP_FIRINGRANGE", "preview_mp_firingrange", dvarint("iw4x_maps_dlc") == 3)
LOCAL_MAP_SELECTION( 11, "mp_bloc", "MPUI_BLOC", "MPUI_DESC_MAP_BLOC", "preview_mp_bloc", dvarint("iw4x_maps_dlc") == 3) LOCAL_MAP_SELECTION(11, "mp_bloc", "MPUI_BLOC", "MPUI_DESC_MAP_BLOC", "preview_mp_bloc", dvarint("iw4x_maps_dlc") == 3)
LOCAL_MAP_SELECTION( 12, "mp_crash_tropical", "MPUI_CRASH_TROPICAL", "MPUI_DESC_MAP_CRASH_TROPICAL", "preview_mp_crash_tropical", dvarint("iw4x_maps_dlc") == 3) LOCAL_MAP_SELECTION(12, "mp_crash_tropical", "MPUI_CRASH_TROPICAL", "MPUI_DESC_MAP_CRASH_TROPICAL", "preview_mp_crash_tropical", dvarint("iw4x_maps_dlc") == 3)
LOCAL_MAP_SELECTION( 13, "mp_estate_tropical", "MPUI_ESTATE_TROPICAL", "MPUI_DESC_MAP_ESTATE_TROPICAL","preview_mp_estate_tropical", dvarint("iw4x_maps_dlc") == 3) LOCAL_MAP_SELECTION(13, "mp_estate_tropical", "MPUI_ESTATE_TROPICAL", "MPUI_DESC_MAP_ESTATE_TROPICAL","preview_mp_estate_tropical", dvarint("iw4x_maps_dlc") == 3)
LOCAL_MAP_SELECTION( 14, "mp_fav_tropical", "MPUI_FAV_TROPICAL", "MPUI_DESC_MAP_FAV_TROPICAL", "preview_mp_fav_tropical", dvarint("iw4x_maps_dlc") == 3) LOCAL_MAP_SELECTION(14, "mp_fav_tropical", "MPUI_FAV_TROPICAL", "MPUI_DESC_MAP_FAV_TROPICAL", "preview_mp_fav_tropical", dvarint("iw4x_maps_dlc") == 3)
LOCAL_MAP_SELECTION( 15, "mp_storm_spring", "MPUI_STORM_SPRING", "MPUI_DESC_MAP_STORM_SPRING", "preview_mp_storm_spring", dvarint("iw4x_maps_dlc") == 3) LOCAL_MAP_SELECTION(15, "mp_storm_spring", "MPUI_STORM_SPRING", "MPUI_DESC_MAP_STORM_SPRING", "preview_mp_storm_spring", dvarint("iw4x_maps_dlc") == 3)
LOCAL_MAP_SELECTION( 0, "mp_farm", "MPUI_FARM", "MPUI_DESC_MAP_FARM", "preview_mp_farm", dvarint("iw4x_maps_dlc") == 4) LOCAL_MAP_SELECTION(0, "mp_farm", "MPUI_FARM", "MPUI_DESC_MAP_FARM", "preview_mp_farm", dvarint("iw4x_maps_dlc") == 4)
LOCAL_MAP_SELECTION( 1, "mp_backlot", "MPUI_BACKLOT", "MPUI_DESC_MAP_BACKLOT", "preview_mp_backlot", dvarint("iw4x_maps_dlc") == 4) LOCAL_MAP_SELECTION(1, "mp_backlot", "MPUI_BACKLOT", "MPUI_DESC_MAP_BACKLOT", "preview_mp_backlot", dvarint("iw4x_maps_dlc") == 4)
LOCAL_MAP_SELECTION( 2, "mp_pipeline", "MPUI_PIPELINE", "MPUI_DESC_PIPELINE", "preview_mp_pipeline", dvarint("iw4x_maps_dlc") == 4) LOCAL_MAP_SELECTION(2, "mp_pipeline", "MPUI_PIPELINE", "MPUI_DESC_PIPELINE", "preview_mp_pipeline", dvarint("iw4x_maps_dlc") == 4)
LOCAL_MAP_SELECTION( 3, "mp_countdown", "MPUI_COUNTDOWN", "MPUI_DESC_MAP_COUNTDOWN", "preview_mp_countdown", dvarint("iw4x_maps_dlc") == 4) LOCAL_MAP_SELECTION(3, "mp_countdown", "MPUI_COUNTDOWN", "MPUI_DESC_MAP_COUNTDOWN", "preview_mp_countdown", dvarint("iw4x_maps_dlc") == 4)
LOCAL_MAP_SELECTION( 4, "mp_crash_snow", "MPUI_CRASH_SNOW", "MPUI_DESC_MAP_CRASH_SNOW", "preview_mp_crash_snow", dvarint("iw4x_maps_dlc") == 4) LOCAL_MAP_SELECTION(4, "mp_crash_snow", "MPUI_CRASH_SNOW", "MPUI_DESC_MAP_CRASH_SNOW", "preview_mp_crash_snow", dvarint("iw4x_maps_dlc") == 4)
LOCAL_MAP_SELECTION( 5, "mp_carentan", "MPUI_CARENTAN", "MPUI_DESC_MAP_CARENTAN", "preview_mp_carentan", dvarint("iw4x_maps_dlc") == 4) LOCAL_MAP_SELECTION(5, "mp_carentan", "MPUI_CARENTAN", "MPUI_DESC_MAP_CARENTAN", "preview_mp_carentan", dvarint("iw4x_maps_dlc") == 4)
LOCAL_MAP_SELECTION( 6, "mp_broadcast", "MPUI_BROADCAST", "MPUI_DESC_MAP_BROADCAST", "preview_mp_broadcast", dvarint("iw4x_maps_dlc") == 4) LOCAL_MAP_SELECTION(6, "mp_broadcast", "MPUI_BROADCAST", "MPUI_DESC_MAP_BROADCAST", "preview_mp_broadcast", dvarint("iw4x_maps_dlc") == 4)
LOCAL_MAP_SELECTION( 7, "mp_showdown", "MPUI_SHOWDOWN", "MPUI_DESC_MAP_SHOWDOWN", "preview_mp_showdown", dvarint("iw4x_maps_dlc") == 4) LOCAL_MAP_SELECTION(7, "mp_showdown", "MPUI_SHOWDOWN", "MPUI_DESC_MAP_SHOWDOWN", "preview_mp_showdown", dvarint("iw4x_maps_dlc") == 4)
LOCAL_MAP_SELECTION( 8, "mp_convoy", "MPUI_CONVOY", "MPUI_DESC_MAP_CONVOY", "preview_mp_convoy", dvarint("iw4x_maps_dlc") == 4) LOCAL_MAP_SELECTION(8, "mp_convoy", "MPUI_CONVOY", "MPUI_DESC_MAP_CONVOY", "preview_mp_convoy", dvarint("iw4x_maps_dlc") == 4)
LOCAL_MAP_SELECTION( 0, "mp_alpha", "MPUI_LOCKDOWN", "MPUI_DESC_MAP_LOCKDOWN", "preview_mp_alpha", dvarint("iw4x_maps_dlc") == 5) LOCAL_MAP_SELECTION(0, "mp_alpha", "MPUI_LOCKDOWN", "MPUI_DESC_MAP_LOCKDOWN", "preview_mp_alpha", dvarint("iw4x_maps_dlc") == 5)
LOCAL_MAP_SELECTION( 1, "mp_bravo", "MPUI_MISSION", "MPUI_DESC_MAP_MISSION", "preview_mp_bravo", dvarint("iw4x_maps_dlc") == 5) LOCAL_MAP_SELECTION(1, "mp_bravo", "MPUI_MISSION", "MPUI_DESC_MAP_MISSION", "preview_mp_bravo", dvarint("iw4x_maps_dlc") == 5)
LOCAL_MAP_SELECTION( 2, "mp_dome", "MPUI_DOME", "MPUI_DESC_MAP_DOME", "preview_mp_dome", dvarint("iw4x_maps_dlc") == 5) LOCAL_MAP_SELECTION(2, "mp_dome", "MPUI_DOME", "MPUI_DESC_MAP_DOME", "preview_mp_dome", dvarint("iw4x_maps_dlc") == 5)
LOCAL_MAP_SELECTION( 3, "mp_hardhat", "MPUI_HARDHAT", "MPUI_DESC_MAP_HARDHAT", "preview_mp_hardhat", dvarint("iw4x_maps_dlc") == 5) LOCAL_MAP_SELECTION(3, "mp_hardhat", "MPUI_HARDHAT", "MPUI_DESC_MAP_HARDHAT", "preview_mp_hardhat", dvarint("iw4x_maps_dlc") == 5)
LOCAL_MAP_SELECTION( 4, "mp_paris", "MPUI_RESISTANCE", "MPUI_DESC_MAP_RESISTANCE", "preview_mp_paris", dvarint("iw4x_maps_dlc") == 5) LOCAL_MAP_SELECTION(4, "mp_paris", "MPUI_RESISTANCE", "MPUI_DESC_MAP_RESISTANCE", "preview_mp_paris", dvarint("iw4x_maps_dlc") == 5)
LOCAL_MAP_SELECTION( 5, "mp_plaza2", "MPUI_ARKADEN", "MPUI_DESC_MAP_ARKADEN", "preview_mp_plaza2", dvarint("iw4x_maps_dlc") == 5) LOCAL_MAP_SELECTION(5, "mp_plaza2", "MPUI_ARKADEN", "MPUI_DESC_MAP_ARKADEN", "preview_mp_plaza2", dvarint("iw4x_maps_dlc") == 5)
LOCAL_MAP_SELECTION( 6, "mp_seatown", "MPUI_SEATOWN", "MPUI_DESC_MAP_SEATOWN", "preview_mp_seatown", dvarint("iw4x_maps_dlc") == 5) LOCAL_MAP_SELECTION(6, "mp_seatown", "MPUI_SEATOWN", "MPUI_DESC_MAP_SEATOWN", "preview_mp_seatown", dvarint("iw4x_maps_dlc") == 5)
LOCAL_MAP_SELECTION( 7, "mp_underground", "MPUI_UNDERGROUND", "MPUI_DESC_MAP_UNDERGROUND", "preview_mp_underground", dvarint("iw4x_maps_dlc") == 5) LOCAL_MAP_SELECTION(7, "mp_underground", "MPUI_UNDERGROUND", "MPUI_DESC_MAP_UNDERGROUND", "preview_mp_underground", dvarint("iw4x_maps_dlc") == 5)
LOCAL_MAP_SELECTION( 8, "mp_village", "MPUI_VILLAGE", "MPUI_DESC_MAP_VILLAGE", "preview_mp_village", dvarint("iw4x_maps_dlc") == 5) LOCAL_MAP_SELECTION(8, "mp_village", "MPUI_VILLAGE", "MPUI_DESC_MAP_VILLAGE", "preview_mp_village", dvarint("iw4x_maps_dlc") == 5)
itemDef itemDef
{ {
name "select_custom_map" name "select_custom_map"
rect 250 -20 96 20 1 3 rect 250 -20 96 20 1 3
visible 1 visible 1
@ -164,25 +164,25 @@
text "@MPUI_DONE_SELECTING" text "@MPUI_DONE_SELECTING"
visible when ( dvarint("iw4x_maps_dlc") == 99 ) visible when ( dvarint("iw4x_maps_dlc") == 99 )
onFocus onFocus
{ {
play CHOICE_FOCUS_SOUND; play CHOICE_FOCUS_SOUND;
setItemColor self backcolor 0 0 0 1; setItemColor self backcolor 0 0 0 1;
setLocalVarBool "ui_menuAButton" ( 1 ); setLocalVarBool "ui_menuAButton" ( 1 );
} }
leaveFocus leaveFocus
{ {
setItemColor self backcolor 0 0 0 0; setItemColor self backcolor 0 0 0 0;
setLocalVarString "ui_hint_text" ( "@NULL_EMPTY" ); setLocalVarString "ui_hint_text" ( "@NULL_EMPTY" );
setLocalVarBool "ui_menuAButton" ( 0 ); setLocalVarBool "ui_menuAButton" ( 0 );
} }
action action
{ {
play "mouse_click"; play "mouse_click";
escape "self"; escape "self";
uiScript "ApplyMap" uiScript "ApplyMap"
close "settings_map"; close "settings_map";
close "self"; close "self";
} }
} }
itemDef itemDef
@ -217,6 +217,7 @@
setItemColor "maplist" bordercolor 1 1 1 "0.15"; setItemColor "maplist" bordercolor 1 1 1 "0.15";
} }
} }
itemDef itemDef
{ {
rect -292 28 292 356 3 1 rect -292 28 292 356 3 1
@ -227,6 +228,7 @@
textScale 0.55 textScale 0.55
visible when ( dvarbool( "widescreen" ) ) visible when ( dvarbool( "widescreen" ) )
} }
itemDef itemDef
{ {
name "mapimage" name "mapimage"
@ -238,6 +240,7 @@
exp material ( localvarstring( "ui_info_icon" ) ) exp material ( localvarstring( "ui_info_icon" ) )
visible when ( localvarstring( "ui_info_icon") != "" && dvarbool( "widescreen" ) && dvarint("iw4x_maps_dlc") != 99 ) visible when ( localvarstring( "ui_info_icon") != "" && dvarbool( "widescreen" ) && dvarint("iw4x_maps_dlc") != 99 )
} }
itemDef itemDef
{ {
name "longname" name "longname"
@ -250,6 +253,7 @@
exp text ( "@" + localvarstring( "ui_info_name" ) ) exp text ( "@" + localvarstring( "ui_info_name" ) )
visible when ( dvarbool( "widescreen" ) ) visible when ( dvarbool( "widescreen" ) )
} }
itemDef itemDef
{ {
name "description" name "description"