From 2e55da2b2d93e6e714b5b5df35f28b1b34889d85 Mon Sep 17 00:00:00 2001
From: Alex King <89047260+Kinglykrab@users.noreply.github.com>
Date: Sun, 5 Mar 2023 22:35:52 -0500
Subject: [PATCH] [Fix] Checkmarks and X characters in popup messages (#3041)
# Notes
- Due to changing the popups to use strings, these show as squares, instead of the proper character.
---
zone/client.cpp | 2 +-
zone/gm_commands/ginfo.cpp | 10 +++++-----
zone/guild_mgr.cpp | 16 ++++++++--------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/zone/client.cpp b/zone/client.cpp
index 503e2c130..36d89a202 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -5168,7 +5168,7 @@ void Client::ShowSkillsWindow()
"| {} | ",
(
skill_maxed ?
- "✔" :
+ "Max" :
fmt::format(
"{}/{}",
current_skill,
diff --git a/zone/gm_commands/ginfo.cpp b/zone/gm_commands/ginfo.cpp
index a8ab9cff1..3850c6b91 100755
--- a/zone/gm_commands/ginfo.cpp
+++ b/zone/gm_commands/ginfo.cpp
@@ -45,7 +45,7 @@ void command_ginfo(Client *c, const Seperator *sep)
if (target_group->membername[group_member][0] == '\0') {
continue;
}
-
+
bool is_assist = target_group->MemberRoles[group_member] & RoleAssist;
bool is_puller = target_group->MemberRoles[group_member] & RolePuller;
bool is_tank = target_group->MemberRoles[group_member] & RoleTank;
@@ -61,10 +61,10 @@ void command_ginfo(Client *c, const Seperator *sep)
target_group->membername[group_member]
)
),
- target_group->members[group_member] ? "✔" : "❌",
- is_assist ? "✔" : "❌",
- is_puller ? "✔" : "❌",
- is_tank ? "✔" : "❌"
+ target_group->members[group_member] ? "Y" : "N",
+ is_assist ? "Y" : "N",
+ is_puller ? "Y" : "N",
+ is_tank ? "Y" : "N"
);
}
diff --git a/zone/guild_mgr.cpp b/zone/guild_mgr.cpp
index ea71c00d4..9756d1a0b 100644
--- a/zone/guild_mgr.cpp
+++ b/zone/guild_mgr.cpp
@@ -338,14 +338,14 @@ void ZoneGuildManager::DescribeGuild(Client *c, uint32 guild_id) const {
popup_text += "";
for (uint8 guild_rank = 0; guild_rank <= GUILD_MAX_RANK; guild_rank++) {
- auto can_hear_guild_chat = info->ranks[guild_rank].permissions[GUILD_HEAR] ? "✔" : "❌";
- auto can_speak_guild_chat = info->ranks[guild_rank].permissions[GUILD_SPEAK] ? "✔" : "❌";
- auto can_invite = info->ranks[guild_rank].permissions[GUILD_INVITE] ? "✔" : "❌";
- auto can_remove = info->ranks[guild_rank].permissions[GUILD_REMOVE] ? "✔" : "❌";
- auto can_promote = info->ranks[guild_rank].permissions[GUILD_PROMOTE] ? "✔" : "❌";
- auto can_demote = info->ranks[guild_rank].permissions[GUILD_DEMOTE] ? "✔" : "❌";
- auto can_set_motd = info->ranks[guild_rank].permissions[GUILD_MOTD] ? "✔" : "❌";
- auto can_war_peace = info->ranks[guild_rank].permissions[GUILD_WARPEACE] ? "✔" : "❌";
+ auto can_hear_guild_chat = info->ranks[guild_rank].permissions[GUILD_HEAR] ? "Y" : "N";
+ auto can_speak_guild_chat = info->ranks[guild_rank].permissions[GUILD_SPEAK] ? "Y" : "N";
+ auto can_invite = info->ranks[guild_rank].permissions[GUILD_INVITE] ? "Y" : "N";
+ auto can_remove = info->ranks[guild_rank].permissions[GUILD_REMOVE] ? "Y" : "N";
+ auto can_promote = info->ranks[guild_rank].permissions[GUILD_PROMOTE] ? "Y" : "N";
+ auto can_demote = info->ranks[guild_rank].permissions[GUILD_DEMOTE] ? "Y" : "N";
+ auto can_set_motd = info->ranks[guild_rank].permissions[GUILD_MOTD] ? "Y" : "N";
+ auto can_war_peace = info->ranks[guild_rank].permissions[GUILD_WARPEACE] ? "Y" : "N";
popup_text += fmt::format(
""
"| {} ({}) | "