MENUQC: Add TIKHAYA NOCH to Menu, support Map Badges

Author: MotoLegacy

source/menu/defs/menu_defs.qc

@@ -167,16 +167,28 @@ var struct
 float user_maps_count;
 float user_maps_page;
 
+// Different categories for maps
+#define MAP_CATEGORY_USER       0
+#define MAP_CATEGORY_WAW        1
+#define MAP_CATEGORY_NZP        2
+#define MAP_CATEGORY_NZPBETA    3
+#define MAP_CATEGORY_BLACKOPSDS 4
+
 // Built-in (stock) maps, array_index
 // is populated later.
 var struct
 {
     string bsp_name;
+    float map_category;
     float array_index;
 } stock_maps[] =
 {
-    {"ndu", 0},
-    {"nzp_warehouse", 0},
-    {"nzp_warehouse2", 0},
-    {"christmas_special", 0}
+    {"ndu", MAP_CATEGORY_WAW, 0},
+    {"nzp_warehouse2", MAP_CATEGORY_NZP, 0},
+    {"nzp_xmas2", MAP_CATEGORY_NZP, 0},
+    {"nzp_warehouse", MAP_CATEGORY_NZPBETA, 0},
+    {"christmas_special", MAP_CATEGORY_NZPBETA, 0},
+    {"lexi_house", MAP_CATEGORY_BLACKOPSDS, 0},
+    {"lexi_temple", MAP_CATEGORY_BLACKOPSDS, 0},
+    {"lexi_overlook", MAP_CATEGORY_BLACKOPSDS, 0},
 };

source/menu/m_menu.qc

@@ -220,12 +220,12 @@ void(float order, string bind) Menu_DrawOptionKey =
 };
 
 //
-// Menu_MapButton(order, id, bsp_name)
+// Menu_MapButton(order, id, bsp_name, map_category, usermap_index)
 // Displays a fancy menu option that loads
 // and draws the details for the given
 // .BSP.
 //
-float(float order, string id, string bsp_name, float usermap_index) Menu_MapButton =
+float(float order, string id, string bsp_name, float map_category, float usermap_index) Menu_MapButton =
 {
 	sui_set_align([SUI_ALIGN_START, SUI_ALIGN_START]);
 
@@ -281,6 +281,22 @@ float(float order, string id, string bsp_name, float usermap_index) Menu_MapButt
 			sui_text([150, 30 + (i * 14)], MENU_TEXT_SMALL, user_maps[index].map_desc[i], [1, 1, 1], 1, 0);
 		}
 
+		// Map Badge
+		string badge_name = "";
+		vector coords_size = [0.25, 0.5];
+		vector coords_pos = [0, 0];
+
+		switch(map_category) {
+			case MAP_CATEGORY_NZPBETA: coords_pos = [0, 0]; badge_name = "NZ:P BETA (2011)"; break;
+			case MAP_CATEGORY_WAW: coords_pos = [0.25, 0]; badge_name = "WORLD AT WAR"; break;
+			case MAP_CATEGORY_NZP: coords_pos = [0, 0.5]; badge_name = "NZ:P ORIGINAL"; break;
+			case MAP_CATEGORY_BLACKOPSDS: coords_pos = [0.25, 0.5]; badge_name = "BLACK OPS (DS)"; break;
+			case MAP_CATEGORY_USER: coords_pos = [0.5, 0]; badge_name = "USERMAP"; break;
+		}
+
+		sui_text([30 + (getTextWidth(badge_name, MENU_TEXT_SUPERSMALL_x)/2), 5], MENU_TEXT_SUPERSMALL, badge_name, [1, 1, 0], 1, 0);
+		sui_subpic([12, 4], [20, 20], "gfx/menu/map_badges", [1, 1, 1], coords_pos, coords_size, 1, 0);
+
 		// Author/Description
 		if (user_maps[index].map_author != "") {
 			sui_set_align([SUI_ALIGN_CENTER, SUI_ALIGN_END]);

source/menu/main.qc

@@ -107,29 +107,12 @@ void() Menu_MapFinder =
 	maps = search_begin("maps/*.bsp", 0, 0);
 	user_maps_count = search_getsize(maps);
 
-	//custom_map_pages = ceil(map_count/10);
-
-	//float stock_step_back; // So stock maps aren't appended to user maps..
 	for (float i = 0; i < user_maps_count; i++) {
-		//float index = i - stock_step_back;
 		float index = i;
 
 		user_maps[index].occupied = TRUE;
 		user_maps[index].map_name = strip_custominfo(search_getfilename(maps, i));
 
-		// float is_stock;
-		// for(int j = 0; j < stock_maps.length; j++) {
-		// 	if (user_maps[index].map_name == stock_maps[j].bsp_name) {
-		// 		stock_step_back++;
-		// 		is_stock = true;
-		// 		break;
-		// 	}
-		// }
-
-		// // Don't bother occupying if this map is built in.
-		// if (is_stock)
-		// 	return;
-
 		float settings = fopen(strcat("maps/", user_maps[index].map_name, ".txt"), FILE_READ);
 		if (settings != -1) {
 			user_maps[index].map_name_pretty = fgets(settings);
@@ -148,7 +131,6 @@ void() Menu_MapFinder =
 		}
 
 	}
-	//user_maps_count -= stock_step_back;
 
 	search_end(maps);
 };

source/menu/menu_maps.qc

@@ -15,6 +15,9 @@ void() Menu_Maps_Init =
     user_maps_page = 0;
 
     for(int i = 0; i < stock_maps.length; i++) {
+        if (stock_maps[i].bsp_name == "")
+            continue;
+        
         for(int j = 0; j < user_maps_count; j++) {
             if (user_maps[j].map_name == stock_maps[i].bsp_name)
                 stock_maps[i].array_index = j;
@@ -129,11 +132,19 @@ void() Menu_Maps =
 
     // Stock Maps
     if (menu_map_mode == MAP_SOLOSTOCK || menu_map_mode == MAP_COOPSTOCK) {
+        int blank_map_spots = 0;
+
         for(i = 0; i < stock_maps.length; i++) {
+            if (stock_maps[i].bsp_name == "") {
+                blank_map_spots++;
+                Menu_DrawDivider(i + 1.25);
+                continue;
+            }
+
             // Build the map strings
-            menu_maps_buttons[i] = sprintf("map_%s", stock_maps[i].bsp_name);
+            menu_maps_buttons[i - blank_map_spots] = sprintf("map_%s", stock_maps[i].bsp_name);
 
-            Menu_MapButton(i + 1, sprintf("map_%s", stock_maps[i].bsp_name), stock_maps[i].bsp_name, -1) ? Menu_Maps_LoadMap(stock_maps[i].bsp_name) : 0;
+            Menu_MapButton(i + 1, sprintf("map_%s", stock_maps[i].bsp_name), stock_maps[i].bsp_name, stock_maps[i].map_category, -1) ? Menu_Maps_LoadMap(stock_maps[i].bsp_name) : 0;
         }
         Menu_DrawDivider(i + 1.25);
 
@@ -169,7 +180,17 @@ void() Menu_Maps =
             // Build the map strings
             menu_maps_buttons[menu_position - 1] = sprintf("map_%s", bsp_name);
 
-            Menu_MapButton(menu_position, sprintf("map_%s", bsp_name), bsp_name, i) ? Menu_Maps_LoadMap(bsp_name) : 0;
+            // Kind of a hack but whatever..
+            // Make sure we keep the correct badge when viewing
+            // official maps in the user maps menu.
+            float map_category = MAP_CATEGORY_USER;
+            for(int j = 0; j < stock_maps.length; j++) {
+                if (user_maps[i].map_name == stock_maps[j].bsp_name) {
+                    map_category = stock_maps[j].map_category;
+                }
+            }
+
+            Menu_MapButton(menu_position, sprintf("map_%s", bsp_name), bsp_name, map_category, i) ? Menu_Maps_LoadMap(bsp_name) : 0;
         }
 
         int current_registry_position = ((i + 1) - (user_maps_page * 10)) - 1;