diff --git a/Source/UI/Guild/UIGuildWnd.cpp b/Source/UI/Guild/UIGuildWnd.cpp index e9935400b..e207ff852 100644 --- a/Source/UI/Guild/UIGuildWnd.cpp +++ b/Source/UI/Guild/UIGuildWnd.cpp @@ -2985,7 +2985,7 @@ int UIGuildInfoManageWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a switch (message) { case 48: { CMode* gameMode = g_modeMgr.GetGameMode(); - if (this->unknown_00E0[a1].id != 27) { + if (this->unknown_00E0[a1].value != 27) { break; } @@ -3030,12 +3030,12 @@ int UIGuildInfoManageWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a g_windowMgr.CloseWindow(18); } if (g_guildInfo.unknown_00B4 != 0) { - this->unknown_00E0.push_back(GuildWndNameEntry{LookupMessage(351), 27}); + this->unknown_00E0.push_back(MiniPartyInfoEntry(LookupMessage(351), 27)); } - if (!this->unknown_00E0.empty()) { + if (this->unknown_00E0.size() != 0) { UIWindow* menu = g_windowMgr.EnsureWindow(18); for (std::size_t index = 0; index < this->unknown_00E0.size(); ++index) { - menu->SendMsg(nullptr, 31, reinterpret_cast(this->unknown_00E0[index].name.c_str()), 0, 0, 0); + menu->SendMsg(nullptr, 31, reinterpret_cast(this->unknown_00E0[index].text.c_str()), 0, 0, 0); } menu->SendMsg(nullptr, 83, 60, 0, 0, 0); menu->SendMsg(nullptr, 30, 0, 0, 0, 0); diff --git a/Source/UI/Guild/UIGuildWnd.h b/Source/UI/Guild/UIGuildWnd.h index 821295db6..1bb0dfaf0 100644 --- a/Source/UI/Guild/UIGuildWnd.h +++ b/Source/UI/Guild/UIGuildWnd.h @@ -56,11 +56,6 @@ struct GuildPositionEntry { /* 002C */ int canStorage; }; -struct GuildWndNameEntry { - /* 0000 */ std::string name; - /* 0018 */ int id; -}; - class UIGuildWnd : public UIFrameWnd { public: UIGuildWnd(); @@ -119,7 +114,7 @@ protected: /* 00D0 */ UIBitmapButton* m_editButton; /* 00D4 */ UIBitmapButton* m_disbandButton; /* 00D8 */ std::list unknown_00D8; - /* 00E0 */ std::vector unknown_00E0; + /* 00E0 */ std::vector unknown_00E0; /* 00EC */ int unknown_00EC; /* 00F0 */ int unknown_00F0; /* 00F4 */ std::uint32_t m_guildId;