pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-12 05:42:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Fix #show group_info Popup (#3605)

Browse Source 
# Notes
- Wasn't using `DialogueWindow::TableCell` so they weren't showing up.
- Fixed `red1` to `red_1` so it shows.
This commit is contained in:
Alex King 2023-10-04 14:40:05 -04:00 committed by GitHub
parent f053cd3b56
commit 7db7631308
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
zone/gm_commands/show/group_info.cpp
View File

@ -46,7 +46,7 @@ void ShowGroupInfo(Client *c, const Seperator *sep)
); );
const std::string yes = DialogueWindow::ColorMessage("forest_green", "Y"); const std::string yes = DialogueWindow::ColorMessage("forest_green", "Y");
const std::string no = DialogueWindow::ColorMessage("red1", "N"); const std::string no = DialogueWindow::ColorMessage("red_1", "N");
for (int group_member = 0; group_member < MAX_GROUP_MEMBERS; group_member++) { for (int group_member = 0; group_member < MAX_GROUP_MEMBERS; group_member++) {
if (g->membername[group_member][0] == '\0') { if (g->membername[group_member][0] == '\0') {
@ -60,8 +60,8 @@ void ShowGroupInfo(Client *c, const Seperator *sep)
popup_table += DialogueWindow::TableRow( popup_table += DialogueWindow::TableRow(
fmt::format( fmt::format(
"{}{}{}{}{}{}", "{}{}{}{}{}{}",
group_member, DialogueWindow::TableCell(std::to_string(group_member)),
( DialogueWindow::TableCell(
strcmp(g->membername[group_member], c->GetCleanName()) ? strcmp(g->membername[group_member], c->GetCleanName()) ?
g->membername[group_member] : g->membername[group_member] :
fmt::format( fmt::format(
@ -69,10 +69,10 @@ void ShowGroupInfo(Client *c, const Seperator *sep)
g->membername[group_member] g->membername[group_member]
) )
), ),
g->members[group_member] ? yes : no, DialogueWindow::TableCell(g->members[group_member] ? yes : no),
is_assist ? yes : no, DialogueWindow::TableCell(is_assist ? yes : no),
is_puller ? yes : no, DialogueWindow::TableCell(is_puller ? yes : no),
is_tank ? yes : no DialogueWindow::TableCell(is_tank ? yes : no)
) )
); );
} }

4
zone/gm_commands/show/zone_data.cpp
View File

@ -24,7 +24,7 @@ void ShowZoneData(Client *c, const Seperator *sep)
fmt::format( fmt::format(
"{} {} {}", "{} {} {}",
DialogueWindow::ColorMessage( DialogueWindow::ColorMessage(
"red1", "red_1",
std::to_string(zone->newzone_data.fog_red[fog_index]) std::to_string(zone->newzone_data.fog_red[fog_index])
), ),
DialogueWindow::ColorMessage( DialogueWindow::ColorMessage(
@ -206,7 +206,7 @@ void ShowZoneData(Client *c, const Seperator *sep)
DialogueWindow::TableCell( DialogueWindow::TableCell(
zone->newzone_data.suspend_buffs ? zone->newzone_data.suspend_buffs ?
DialogueWindow::ColorMessage("forest_green", "Y") : DialogueWindow::ColorMessage("forest_green", "Y") :
DialogueWindow::ColorMessage("red1", "N") DialogueWindow::ColorMessage("red_1", "N")
) )
); );