From d2c4257c3619efe8df3822ff8ea41713687b9650 Mon Sep 17 00:00:00 2001
From: Sikari <37634135+Sikarii@users.noreply.github.com>
Date: Tue, 3 May 2022 12:10:10 +0300
Subject: [PATCH] Prevent workshop prefix from showing in nominations results
menu (#1737)
Prevents workshop prefixes from being shown instead of the display names in results menus when items are disabled
---
plugins/nominations.sp | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/plugins/nominations.sp b/plugins/nominations.sp
index 40dbef78..20e8a712 100644
--- a/plugins/nominations.sp
+++ b/plugins/nominations.sp
@@ -245,7 +245,11 @@ public Action Command_Nominate(int client, int args)
for (int i = 0; i < results.Length; i++)
{
g_MapList.GetString(results.Get(i), mapResult, sizeof(mapResult));
- menu.AddItem(mapResult, mapResult);
+
+ char displayName[PLATFORM_MAX_PATH];
+ GetMapDisplayName(mapResult, displayName, sizeof(displayName));
+
+ menu.AddItem(mapResult, displayName);
}
menu.Display(client, 30);
@@ -472,21 +476,24 @@ public int MenuHandler_MapSelect(Menu menu, MenuAction action, int param1, int p
if ((status & MAPSTATUS_DISABLED) == MAPSTATUS_DISABLED)
{
+ char displayName[PLATFORM_MAX_PATH];
+ GetMapDisplayName(mapname, displayName, sizeof(displayName));
+
if ((status & MAPSTATUS_EXCLUDE_CURRENT) == MAPSTATUS_EXCLUDE_CURRENT)
{
- Format(mapname, sizeof(mapname), "%s (%T)", mapname, "Current Map", param1);
+ Format(mapname, sizeof(mapname), "%s (%T)", displayName, "Current Map", param1);
return RedrawMenuItem(mapname);
}
if ((status & MAPSTATUS_EXCLUDE_PREVIOUS) == MAPSTATUS_EXCLUDE_PREVIOUS)
{
- Format(mapname, sizeof(mapname), "%s (%T)", mapname, "Recently Played", param1);
+ Format(mapname, sizeof(mapname), "%s (%T)", displayName, "Recently Played", param1);
return RedrawMenuItem(mapname);
}
if ((status & MAPSTATUS_EXCLUDE_NOMINATED) == MAPSTATUS_EXCLUDE_NOMINATED)
{
- Format(mapname, sizeof(mapname), "%s (%T)", mapname, "Nominated", param1);
+ Format(mapname, sizeof(mapname), "%s (%T)", displayName, "Nominated", param1);
return RedrawMenuItem(mapname);
}
}