alliedmodders · powerlord · Jun 15, 2015 · Jun 15, 2015 · Jun 16, 2015 · Jun 16, 2015
diff --git a/plugins/basecommands/map.sp b/plugins/basecommands/map.sp
@@ -42,11 +42,12 @@ public MenuHandler_ChangeMap(Menu menu, MenuAction action, int param1, int param
 	}
 	else if (action == MenuAction_Select)
 	{
-		decl String:map[64];
+		decl String:map[PLATFORM_MAX_PATH];
+		decl String:friendly_name[PLATFORM_MAX_PATH];
 
-		menu.GetItem(param2, map, sizeof(map));
+		menu.GetItem(param2, map, sizeof(map), _, friendly_name, sizeof(friendly_name));
 
-		ShowActivity2(param1, "[SM] ", "%t", "Changing map", map);
+		ShowActivity2(param1, "[SM] ", "%t", "Changing map", friendly_name);
 
 		LogAction(param1, -1, "\"%L\" changed map to \"%s\"", param1, map);
 
@@ -87,7 +88,7 @@ public Action:Command_Map(client, args)
 		return Plugin_Handled;
 	}
 
-	decl String:map[64];
+	decl String:map[PLATFORM_MAX_PATH];
 	GetCmdArg(1, map, sizeof(map));
 
 	if (!IsMapValid(map))
@@ -109,7 +110,7 @@ public Action:Command_Map(client, args)
 
 public Action:Timer_ChangeMap(Handle:timer, Handle:dp)
 {
-	decl String:map[65];
+	decl String:map[PLATFORM_MAX_PATH];
 
 	ResetPack(dp);
 	ReadPackString(dp, map, sizeof(map));
@@ -142,13 +143,16 @@ int LoadMapList(Menu menu)
 
 	RemoveAllMenuItems(menu);
 
-	char map_name[64];
+	char map_name[PLATFORM_MAX_PATH];
+	char friendly_name[PLATFORM_MAX_PATH];
+
 	int map_count = GetArraySize(g_map_array);
 
 	for (int i = 0; i < map_count; i++)
 	{
 		GetArrayString(g_map_array, i, map_name, sizeof(map_name));
-		menu.AddItem(map_name, map_name);
+		GetFriendlyMapName(map_name, friendly_name, sizeof(friendly_name), false);
+		menu.AddItem(map_name, friendly_name);
 	}
 
 	return map_count;

diff --git a/plugins/basetriggers.sp b/plugins/basetriggers.sp
@@ -211,7 +211,9 @@ public Action:Command_Nextmap(client, args)
 	}
 	else
 	{
-		ReplyToCommand(client, "[SM] %t", "Next Map", map);
+		decl String:friendlyName[PLATFORM_MAX_PATH];
+		GetFriendlyMapName(map, friendlyName, sizeof(friendlyName), false);
+		ReplyToCommand(client, "[SM] %t", "Next Map", friendlyName);
 	}
 
 	return Plugin_Handled;
@@ -290,8 +292,10 @@ public OnClientSayCommand_Post(client, const String:command[], const String:sArg
 	else if (strcmp(sArgs, "nextmap", false) == 0)
 	{
 		char map[PLATFORM_MAX_PATH];
+		char friendlyName[PLATFORM_MAX_PATH];
 		GetNextMap(map, sizeof(map));
-
+		GetFriendlyMapName(map, friendlyName, sizeof(friendlyName), false);
+
 		if (g_Cvar_TriggerShow.IntValue)
 		{
 			if (mapchooser && EndOfMapVoteEnabled() && !HasEndOfMapVoteFinished())
@@ -300,7 +304,7 @@ public OnClientSayCommand_Post(client, const String:command[], const String:sArg
 			}
 			else
 			{
-				PrintToChatAll("[SM] %t", "Next Map", map);
+				PrintToChatAll("[SM] %t", "Next Map", friendlyName);
 			}
 		}
 		else
@@ -311,7 +315,7 @@ public OnClientSayCommand_Post(client, const String:command[], const String:sArg
 			}
 			else
 			{
-				PrintToChat(client, "[SM] %t", "Next Map", map);
+				PrintToChat(client, "[SM] %t", "Next Map", friendlyName);
 			}
 		}
 	}

diff --git a/plugins/basevotes.sp b/plugins/basevotes.sp
@@ -116,7 +116,7 @@ public OnPluginStart()
 		OnAdminMenuReady(topmenu);
 	}
 
-	g_SelectedMaps = CreateArray(33);
+	g_SelectedMaps = CreateArray(ByteCountToCells(PLATFORM_MAX_PATH));
 
 	g_MapList = CreateMenu(MenuHandler_Map, MenuAction_DrawItem|MenuAction_Display);
 	g_MapList.SetTitle("%T", "Please select a map", LANG_SERVER);
@@ -311,8 +311,11 @@ public Handler_VoteCallback(Menu menu, MenuAction action, param1, param2)
 
 				case (voteType:map):
 				{
+					// single-vote items don't use the display item
+					char friendlyName[PLATFORM_MAX_PATH];
+					GetFriendlyMapName(item, friendlyName, sizeof(friendlyName), false);
 					LogAction(-1, -1, "Changing map to %s due to vote.", item);
-					PrintToChatAll("[SM] %t", "Changing map", item);
+					PrintToChatAll("[SM] %t", "Changing map", friendlyName);
 					new Handle:dp;
 					CreateDataTimer(5.0, Timer_ChangeMap, dp);
 					WritePackString(dp, item);		

diff --git a/plugins/basevotes/votemap.sp b/plugins/basevotes/votemap.sp
@@ -48,7 +48,9 @@ DisplayVoteMapMenu(client, mapCount, String:maps[5][])
 
 	if (mapCount == 1)
 	{
-		strcopy(g_voteInfo[VOTE_NAME], sizeof(g_voteInfo[]), maps[0]);
+		decl String:friendlyName[PLATFORM_MAX_PATH];
+		GetFriendlyMapName(maps[0], friendlyName, sizeof(friendlyName), false);
+		strcopy(g_voteInfo[VOTE_NAME], sizeof(g_voteInfo[]), friendlyName);
 
 		g_hVoteMenu.SetTitle("Change Map To");
 		g_hVoteMenu.AddItem(maps[0], "Yes");
@@ -61,7 +63,9 @@ DisplayVoteMapMenu(client, mapCount, String:maps[5][])
 		g_hVoteMenu.SetTitle("Map Vote");
 		for (new i = 0; i < mapCount; i++)
 		{
-			g_hVoteMenu.AddItem(maps[i], maps[i]);
+			decl String:friendlyName[PLATFORM_MAX_PATH];
+			GetFriendlyMapName(maps[i], friendlyName, sizeof(friendlyName), false);
+			g_hVoteMenu.AddItem(maps[i], friendlyName);
 		}	
 	}
 
@@ -288,8 +292,10 @@ int LoadMapList(Menu menu)
 
 	for (new i = 0; i < map_count; i++)
 	{
+		decl String:friendly_name[PLATFORM_MAX_PATH];
 		GetArrayString(g_map_array, i, map_name, sizeof(map_name));
-		menu.AddItem(map_name, map_name);
+		GetFriendlyMapName(map_name, friendly_name, sizeof(friendly_name), false);
+		menu.AddItem(map_name, friendly_name);
 	}
 
 	return map_count;

diff --git a/plugins/include/sourcemod.inc b/plugins/include/sourcemod.inc
@@ -530,6 +530,62 @@ native Handle:ReadMapList(Handle:array=INVALID_HANDLE,
  */
 native SetMapListCompatBind(const String:name[], const String:file[]);
 
+/**
+ * Get a "friendly" name for a Workshop map.
+ * 
+ * Note: non-Workshop maps will be ignored.
+ * 
+ * @param resolvedMap		A map name returned from FindMap (or not, see bIsMapResolved)
+ * @param friendlyName		The map name with the extra workshop path bits removed
+ * @param maxlength			The max length of friendlyName
+ * 							(We recommend PLATFORM_MAX_PATH)
+ * @param bIsMapResolved	True if map is a resolved Fuzzy Name, false if we need to resolve it first.
+ * 							Convenience field for plugins that don't need the resolved map name.
+ */
+stock void GetFriendlyMapName(const char[] resolvedMap, char[] friendlyName, int maxlength, bool bIsMapResolved=true)
+{
+	char szTmp[PLATFORM_MAX_PATH];
+	strcopy(szTmp, sizeof(szTmp), resolvedMap);
+
+	if (!bIsMapResolved)
+	{
+		FindMap(szTmp, sizeof(szTmp));
+	}
+
+	EngineVersion version = GetEngineVersion();
+	switch (version)
+	{
+		case Engine_TF2:
+		{
+			int ugcPos;
+
+			// In TF2, workshop maps show up as workshop/mapname.ugc123456789
+			if (strncmp(szTmp, "workshop/", 9) == 0 && (ugcPos = StrContains(szTmp, ".ugc")) > -1)
+			{
+				// technically, this is (ugcPos + 1) - 9, but lets just cancel the 1.
+				strcopy(friendlyName, maxlength < ugcPos - 8 ? maxlength : ugcPos - 8, szTmp[9]);
+				return;
+			}
+		}
+
+		case Engine_CSGO:
+		{
+			int lastSlashPos;
+
+			// In CSGO, workshop maps show up as workshop/123456789/mapname
+			if (strncmp(szTmp, "workshop/", 9) == 0 && (lastSlashPos = FindCharInString(szTmp, '/', true)) > 9)
+			{
+				int newlength = strlen(szTmp) - lastSlashPos;
+				strcopy(friendlyName, maxlength < newlength ? maxlength : newlength, szTmp[lastSlashPos+1]);
+				return;
+			}
+		}
+	}
+
+	// Fallback to just copying the name back to itself
+	strcopy(friendlyName, maxlength, szTmp);
+}
+
 /**
  * Called when a client has sent chat text.  This must return either true or 
  * false to indicate that a client is or is not spamming the server.

diff --git a/plugins/mapchooser.sp b/plugins/mapchooser.sp
@@ -74,6 +74,8 @@ ConVar g_Cvar_RunOffPercent;
 Handle g_VoteTimer = null;
 Handle g_RetryTimer = null;
 
+// g_MapList stores unresolved names so we can resolve them after every map change in the workshop updates.
+// g_OldMapList and g_NextMapList are resolved. g_NominateList depends on the nominations implementation.
 /* Data Handles */
 ArrayList g_MapList;
 ArrayList g_NominateList;
@@ -321,7 +323,7 @@ void SetupTimeleftTimer()
 		int startTime = g_Cvar_StartTime.IntValue * 60;
 		if (time - startTime < 0 && g_Cvar_EndOfMapVote.BoolValue && !g_MapVoteCompleted && !g_HasVoteStarted)
 		{
-			InitiateVote(MapChange_MapEnd, null);		
+			InitiateVote(MapChange_MapEnd, null);
 		}
 		else
 		{
@@ -585,11 +587,14 @@ void InitiateVote(MapChange when, ArrayList inputlist=null)
 		/* Smaller of the two - It should be impossible for nominations to exceed the size though (cvar changed mid-map?) */
 		int nominationsToAdd = nominateCount >= voteSize ? voteSize : nominateCount;
 
-
+		char friendlyName[PLATFORM_MAX_PATH];
 		for (int i=0; i<nominationsToAdd; i++)
 		{
+
 			g_NominateList.GetString(i, map, sizeof(map));
-			g_VoteMenu.AddItem(map, map);
+			GetFriendlyMapName(map, friendlyName, sizeof(friendlyName), false);
+
+			g_VoteMenu.AddItem(map, friendlyName);
 			RemoveStringFromArray(g_NextMapList, map);
 
 			/* Notify Nominations that this map is now free */
@@ -630,7 +635,8 @@ void InitiateVote(MapChange when, ArrayList inputlist=null)
 			count++;
 
 			/* Insert the map and increment our count */
-			g_VoteMenu.AddItem(map, map);
+			GetFriendlyMapName(map, friendlyName, sizeof(friendlyName));			
+			g_VoteMenu.AddItem(map, friendlyName);
 			i++;
 		}
 
@@ -648,7 +654,9 @@ void InitiateVote(MapChange when, ArrayList inputlist=null)
 
 			if (IsMapValid(map))
 			{
-				g_VoteMenu.AddItem(map, map);
+				char friendlyName[PLATFORM_MAX_PATH];
+				GetFriendlyMapName(map, friendlyName, sizeof(friendlyName));
+				g_VoteMenu.AddItem(map, friendlyName);
 			}	
 		}
 	}
@@ -689,7 +697,8 @@ public void Handler_VoteFinishedGeneric(Menu menu,
 						   const int[][] item_info)
 {
 	char map[PLATFORM_MAX_PATH];
-	menu.GetItem(item_info[0][VOTEINFO_ITEM_INDEX], map, sizeof(map));
+	char friendlyName[PLATFORM_MAX_PATH];
+	menu.GetItem(item_info[0][VOTEINFO_ITEM_INDEX], map, sizeof(map), _, friendlyName, sizeof(friendlyName));
 
 	if (strcmp(map, VOTE_EXTEND, false) == 0)
 	{
@@ -771,7 +780,7 @@ public void Handler_VoteFinishedGeneric(Menu menu,
 		g_HasVoteStarted = false;
 		g_MapVoteCompleted = true;
 
-		PrintToChatAll("[SM] %t", "Nextmap Voting Finished", map, RoundToFloor(float(item_info[0][VOTEINFO_ITEM_VOTES])/float(num_votes)*100), num_votes);
+		PrintToChatAll("[SM] %t", "Nextmap Voting Finished", friendlyName, RoundToFloor(float(item_info[0][VOTEINFO_ITEM_VOTES])/float(num_votes)*100), num_votes);
 		LogAction(-1, -1, "Voting for next map has finished. Nextmap: %s.", map);
 	}	
 }
@@ -940,10 +949,19 @@ bool RemoveStringFromArray(ArrayList array, char[] str)
 
 void CreateNextVote()
 {
-	ClearArray(g_NextMapList);
+	g_NextMapList.Clear();
 
 	char map[PLATFORM_MAX_PATH];
-	ArrayList tempMaps = g_MapList.Clone();
+	ArrayList tempMaps = new ArrayList(ByteCountToCells(PLATFORM_MAX_PATH));
+
+	for (int i = 0; i < g_MapList.Length; i++)
+	{
+		g_MapList.GetString(i, map, sizeof(map));
+		if (FindMap(map, sizeof(map)) != FindMap_NotFound)
+		{
+			tempMaps.PushString(map);
+		}
+	}
 
 	GetCurrentMap(map, sizeof(map));
 	RemoveStringFromArray(tempMaps, map);
@@ -954,7 +972,7 @@ void CreateNextVote()
 		{
 			g_OldMapList.GetString(i, map, sizeof(map));
 			RemoveStringFromArray(tempMaps, map);
-		}	
+		}
 	}
 
 	int limit = (g_Cvar_IncludeMaps.IntValue < tempMaps.Length ? g_Cvar_IncludeMaps.IntValue : tempMaps.Length);

diff --git a/plugins/nextmap.sp b/plugins/nextmap.sp
@@ -144,6 +144,7 @@ void FindAndSetNextMap()
 
 	int mapCount = g_MapList.Length;
 	char mapName[PLATFORM_MAX_PATH];
+	char resolvedMap[PLATFORM_MAX_PATH];
 
 	if (g_MapPos == -1)
 	{
@@ -153,7 +154,9 @@ void FindAndSetNextMap()
 		for (int i = 0; i < mapCount; i++)
 		{
 			g_MapList.GetString(i, mapName, sizeof(mapName));
-			if (strcmp(current, mapName, false) == 0)
+			strcopy(resolvedMap, sizeof(resolvedMap), mapName);
+			if (FindMap(resolvedMap, sizeof(resolvedMap)) != FindMap_NotFound && 
+				strcmp(current, resolvedMap, false) == 0)
 			{
 				g_MapPos = i;
 				break;