Skip to content

Commit

Permalink
[Fix] Checkmarks and X characters in popup messages (EQEmu#3041)
Browse files Browse the repository at this point in the history
# Notes
- Due to changing the popups to use strings, these show as squares, instead of the proper character.
  • Loading branch information
Kinglykrab authored and nytmyr committed Mar 24, 2023
1 parent 4bfbd2a commit 4977346
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion zone/client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5184,7 +5184,7 @@ void Client::ShowSkillsWindow()
"<td>{}</td>",
(
skill_maxed ?
"<c \"#00FF00\"></c>" :
"<c \"#00FF00\">Max</c>" :
fmt::format(
"{}/{}",
current_skill,
Expand Down
10 changes: 5 additions & 5 deletions zone/gm_commands/ginfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -61,10 +61,10 @@ void command_ginfo(Client *c, const Seperator *sep)
target_group->membername[group_member]
)
),
target_group->members[group_member] ? "<c \"#00FF00\"></c>" : "<c \"#F62217\"></c>",
is_assist ? "<c \"#00FF00\"></c>" : "<c \"#F62217\"></c>",
is_puller ? "<c \"#00FF00\"></c>" : "<c \"#F62217\"></c>",
is_tank ? "<c \"#00FF00\"></c>" : "<c \"#F62217\"></c>"
target_group->members[group_member] ? "<c \"#00FF00\">Y</c>" : "<c \"#F62217\">N</c>",
is_assist ? "<c \"#00FF00\">Y</c>" : "<c \"#F62217\">N</c>",
is_puller ? "<c \"#00FF00\">Y</c>" : "<c \"#F62217\">N</c>",
is_tank ? "<c \"#00FF00\">Y</c>" : "<c \"#F62217\">N</c>"
);
}

Expand Down
16 changes: 8 additions & 8 deletions zone/guild_mgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -338,14 +338,14 @@ void ZoneGuildManager::DescribeGuild(Client *c, uint32 guild_id) const {
popup_text += "</tr>";

for (uint8 guild_rank = 0; guild_rank <= GUILD_MAX_RANK; guild_rank++) {
auto can_hear_guild_chat = info->ranks[guild_rank].permissions[GUILD_HEAR] ? "<c \"#00FF00\"></c>" : "<c \"#F62217\"></c>";
auto can_speak_guild_chat = info->ranks[guild_rank].permissions[GUILD_SPEAK] ? "<c \"#00FF00\"></c>" : "<c \"#F62217\"></c>";
auto can_invite = info->ranks[guild_rank].permissions[GUILD_INVITE] ? "<c \"#00FF00\"></c>" : "<c \"#F62217\"></c>";
auto can_remove = info->ranks[guild_rank].permissions[GUILD_REMOVE] ? "<c \"#00FF00\"></c>" : "<c \"#F62217\"></c>";
auto can_promote = info->ranks[guild_rank].permissions[GUILD_PROMOTE] ? "<c \"#00FF00\"></c>" : "<c \"#F62217\"></c>";
auto can_demote = info->ranks[guild_rank].permissions[GUILD_DEMOTE] ? "<c \"#00FF00\"></c>" : "<c \"#F62217\"></c>";
auto can_set_motd = info->ranks[guild_rank].permissions[GUILD_MOTD] ? "<c \"#00FF00\"></c>" : "<c \"#F62217\"></c>";
auto can_war_peace = info->ranks[guild_rank].permissions[GUILD_WARPEACE] ? "<c \"#00FF00\"></c>" : "<c \"#F62217\"></c>";
auto can_hear_guild_chat = info->ranks[guild_rank].permissions[GUILD_HEAR] ? "<c \"#00FF00\">Y</c>" : "<c \"#F62217\">N</c>";
auto can_speak_guild_chat = info->ranks[guild_rank].permissions[GUILD_SPEAK] ? "<c \"#00FF00\">Y</c>" : "<c \"#F62217\">N</c>";
auto can_invite = info->ranks[guild_rank].permissions[GUILD_INVITE] ? "<c \"#00FF00\">Y</c>" : "<c \"#F62217\">N</c>";
auto can_remove = info->ranks[guild_rank].permissions[GUILD_REMOVE] ? "<c \"#00FF00\">Y</c>" : "<c \"#F62217\">N</c>";
auto can_promote = info->ranks[guild_rank].permissions[GUILD_PROMOTE] ? "<c \"#00FF00\">Y</c>" : "<c \"#F62217\">N</c>";
auto can_demote = info->ranks[guild_rank].permissions[GUILD_DEMOTE] ? "<c \"#00FF00\">Y</c>" : "<c \"#F62217\">N</c>";
auto can_set_motd = info->ranks[guild_rank].permissions[GUILD_MOTD] ? "<c \"#00FF00\">Y</c>" : "<c \"#F62217\">N</c>";
auto can_war_peace = info->ranks[guild_rank].permissions[GUILD_WARPEACE] ? "<c \"#00FF00\">Y</c>" : "<c \"#F62217\">N</c>";
popup_text += fmt::format(
"<tr>"
"<td>{} ({})</td>"
Expand Down

0 comments on commit 4977346

Please sign in to comment.