Remove obsolete Store function and redirect to DLC download page directly

iw4x/iw4x_00/localizedstrings/iw4x_english.str

@@ -281,13 +281,13 @@ REFERENCE			MPUI_DESC_MODS
 LANG_ENGLISH		"Browse your Mods"
 
 REFERENCE			MENU_STORE
-LANG_ENGLISH		"Store"
+LANG_ENGLISH		"Get DLC"
 
 REFERENCE			MENU_STORE_CAPS
-LANG_ENGLISH		"STORE"
+LANG_ENGLISH		"GET DLC"
 
 REFERENCE			MPUI_DESC_STORE
-LANG_ENGLISH		"Browse for available downloadable game content."
+LANG_ENGLISH		"Redirects to the XLabs Site containing download information for DLC"
 
 REFERENCE			MENU_FRIENDS
 LANG_ENGLISH		"Friends"
@@ -709,54 +709,6 @@ LANG_ENGLISH		"XUID doesn't match the certificate!"
 REFERENCE			ERR_INVALID_CHALLENGE_SIGNATURE
 LANG_ENGLISH		"Challenge signature was invalid!"
 
-REFERENCE			PATCH_DLC1
-LANG_ENGLISH		"Stimulus Pack"
-
-REFERENCE			PATCH_DESC_DLC1
-LANG_ENGLISH		"The Modern Warfare 2 Stimulus Package delivers additional action-packed multiplayer maps, including brand-new battlegrounds and legendary fan-favorites from Call of Duty 4: Modern Warfare."
-
-REFERENCE			PATCH_DLC2
-LANG_ENGLISH		"Resurgence Pack"
-
-REFERENCE			PATCH_DESC_DLC2
-LANG_ENGLISH		"The Modern Warfare 2 Resurgence Pack delivers five incredible new multiplayer maps. Take the action to exciting new locations, then battle across legendary landscapes from Call of Duty 4: Modern Warfare."
-
-REFERENCE			PATCH_DLC3
-LANG_ENGLISH		"Nuketown"
-
-REFERENCE			PATCH_DESC_DLC3
-LANG_ENGLISH		"Nuketown is an iconic multiplayer map featured in Call of Duty: Black Ops with a heavy emphasis on extremely close-quarters combat."
-
-REFERENCE			PATCH_DLC4
-LANG_ENGLISH		"Classics Pack #1"
-
-REFERENCE			PATCH_DESC_DLC4
-LANG_ENGLISH		"The Modern Warfare 2 Classics Pack delivers three beloved maps from Call of Duty 4: Modern Warfare."
-
-REFERENCE			PATCH_DLC5
-LANG_ENGLISH		"Classics Pack #2"
-
-REFERENCE			PATCH_DESC_DLC5
-LANG_ENGLISH		"The second Modern Warfare 2 Classics Pack adds two more fantastic maps from Call of Duty 4: Modern Warfare to your collection."
-
-REFERENCE			PATCH_DLC6
-LANG_ENGLISH		"Freighter"
-
-REFERENCE			PATCH_DESC_DLC6
-LANG_ENGLISH		"Freighter is a snow covered version of the Call of Duty 4: Modern Warfare map Wet Work."
-
-REFERENCE			PATCH_DLC7
-LANG_ENGLISH		"Resurrection Pack"
-
-REFERENCE			PATCH_DESC_DLC7
-LANG_ENGLISH		"The Modern Warfare 2 Resurrection Pack brings three more maps into your battleground."
-
-REFERENCE			PATCH_DLC8
-LANG_ENGLISH		"Recycled Pack"
-
-REFERENCE			PATCH_DESC_DLC8
-LANG_ENGLISH		"Too much 'pew pew' not enough new new. - R. Bowling"
-
 REFERENCE			MENU_STREAMFRIENDLY_UI
 LANG_ENGLISH		"Stream Friendly UI"
 

iw4x/iw4x_00/ui_mp/main_text.menu

@@ -94,7 +94,7 @@
 		MENU_CHOICE_BUTTON_VIS(6, button_6, "@MENU_THEATER_CAPS", open pc_theater_menu;, "@MPUI_DESC_THEATER", 1)
 		MENU_CHOICE_HORIZONTAL_LINE_VIS(7, 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_STORE_CAPS", open pc_store, "@MPUI_DESC_STORE", 1)
+		MENU_CHOICE_BUTTON_VIS(8, button_8, "@MENU_STORE_CAPS", uiScript "downloadDLC" 1, "@MPUI_DESC_STORE", 1)
 		MENU_CHOICE_NEWICON_VIS(8, when(!dvarBool(isDlcInstalled_All)))
 		MENU_CHOICE_HORIZONTAL_LINE_VIS(8, 1)
 		MENU_CHOICE_BUTTON_VIS(9, button_9, "@MENU_OPTIONS_CAPS", open pc_options_video;, "@MPUI_DESC_OPTIONS", 1)

iw4x/iw4x_00/ui_mp/pc_store.menu

@@ -1,79 +0,0 @@
-#include "ui/menudef.h"
-#include "ui_mp/main.inc"
-
-#define MENU_NAME									"pc_store"
-#define MENU_MUSIC									"music_mainmenu_mp"
-#define MENU_TITLE									"@MENU_STORE_CAPS"
-
-#undef CHOICE_GROUP
-#define CHOICE_GROUP								MENU_NAME
-
-#define CHOICE_Y(i)									(28 + (i * 20))
-#define CHOICE_ORIGIN(i)							-64 CHOICE_Y(i)
-#define CHOICE_RECT(i)								CHOICE_ORIGIN(i) 336 20 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
-
-#define HR_ORIGIN(i)								0 (CHOICE_Y(i) - 0.5)
-#define HR_RECT(i)									HR_ORIGIN(i) 216 1 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
-
-#define HAS_DLC1									dvarbool(isDlcInstalled_1)
-#define HAS_DLC2									dvarbool(isDlcInstalled_2)
-#define HAS_DLC3									dvarbool(isDlcInstalled_3)
-#define HAS_DLC4									dvarbool(isDlcInstalled_4)
-#define HAS_DLC5									dvarbool(isDlcInstalled_5)
-#define HAS_DLC6									dvarbool(isDlcInstalled_6)
-#define HAS_DLC7									dvarbool(isDlcInstalled_7)
-#define HAS_DLC8									dvarbool(isDlcInstalled_8)
-
-#define ON_MENU_OPEN \
-	setLocalVarString								ui_info_name ""; \
-	setLocalVarString								ui_info_desc ""; \
-	setLocalVarString								ui_info_icon ""; \
-	setFocus										"button_dlc1";
-
-menuDef
-{
-	name											MENU_NAME
-	fullscreen										1
-	rect											0 0 640 480
-	foreColor										CHOICE_TEXTCOLOR
-	focusColor										CHOICE_TEXTCOLOR
-	soundLoop										MENU_MUSIC
-	fadeCycle										1
-	fadeClamp										1
-	fadeAmount										0.1
-
-	MENU_ON_OPEN(ON_MENU_OPEN)
-	MENU_ON_ESC(close self;)
-
-	#define DISABLE_SIDEBAR
-	#include "ui_mp/bg.inc"
-
-	MENU_ITEM_TITLE(0)
-	MENU_BACKGROUND_FRAME
-	MENU_BACKGROUND_PANEL_RIGHT
-
-	MENU_CHOICE_BUTTON_ADVANCED_VIS(0, button_dlc1, "@PATCH_DLC1", uiScript "downloadDLC" 1, "preview_dlc1", "PATCH_DLC1", "PATCH_DESC_DLC1", 1)
-	MENU_CHOICE_NEWICON_VIS(0, when(!HAS_DLC1))
-	MENU_CHOICE_BUTTON_ADVANCED_VIS(1, button_dlc2, "@PATCH_DLC2", uiScript "downloadDLC" 2, "preview_dlc2", "PATCH_DLC2", "PATCH_DESC_DLC2", 1)
-	MENU_CHOICE_NEWICON_VIS(1, when(!HAS_DLC2))
-
-	MENU_CHOICE_HORIZONTAL_LINE(2)
-
-	MENU_CHOICE_BUTTON_ADVANCED_VIS(2, button_dlc4, "@PATCH_DLC4", uiScript "downloadDLC" 4, "preview_dlc4", "PATCH_DLC4", "PATCH_DESC_DLC4", 1)
-	MENU_CHOICE_NEWICON_VIS(2, when(!HAS_DLC4))
-	MENU_CHOICE_BUTTON_ADVANCED_VIS(3, button_dlc5, "@PATCH_DLC5", uiScript "downloadDLC" 5, "preview_dlc5", "PATCH_DLC5", "PATCH_DESC_DLC5", 1)
-	MENU_CHOICE_NEWICON_VIS(3, when(!HAS_DLC5))
-	MENU_CHOICE_BUTTON_ADVANCED_VIS(4, button_dlc7, "@PATCH_DLC7", uiScript "downloadDLC" 7, "preview_dlc7", "PATCH_DLC7", "PATCH_DESC_DLC7", 1)
-	MENU_CHOICE_NEWICON_VIS(4, when(!HAS_DLC7))
-	MENU_CHOICE_BUTTON_ADVANCED_VIS(5, button_dlc8, "@PATCH_DLC8", uiScript "downloadDLC" 8, "preview_dlc8", "PATCH_DLC8", "PATCH_DESC_DLC8", 1)
-	MENU_CHOICE_NEWICON_VIS(5, when(!HAS_DLC8))
-
-	MENU_CHOICE_HORIZONTAL_LINE(6)
-
-	MENU_CHOICE_BUTTON_ADVANCED_VIS(6, button_dlc3, "@PATCH_DLC3", uiScript "downloadDLC" 3, "preview_dlc3", "PATCH_DLC3", "PATCH_DESC_DLC3", 1)
-	MENU_CHOICE_NEWICON_VIS(6, when(!HAS_DLC3))
-	MENU_CHOICE_BUTTON_ADVANCED_VIS(7, button_dlc6, "@PATCH_DLC6", uiScript "downloadDLC" 6, "preview_dlc6", "PATCH_DLC6", "PATCH_DESC_DLC6", 1)
-	MENU_CHOICE_NEWICON_VIS(7, when(!HAS_DLC6))
-
-	ITEM_BUTTON_BACK(close self;)
-}