summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-14 00:24:26 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-14 00:24:26 +0300
commit69348d6158802801a626938d5ced85807fd514d8 (patch)
tree647dc95866ef2ef2d9d1c112459a8ce9f321bcfe /src/gui
parent8438ad4513e9aa2af4b42317aa05358e36f06e98 (diff)
downloadmv-69348d6158802801a626938d5ced85807fd514d8.tar.gz
mv-69348d6158802801a626938d5ced85807fd514d8.tar.bz2
mv-69348d6158802801a626938d5ced85807fd514d8.tar.xz
mv-69348d6158802801a626938d5ced85807fd514d8.zip
eathena: fix packet SMSG_PARTY_INVITED 0x02c6.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/windows/socialwindow.cpp9
-rw-r--r--src/gui/windows/socialwindow.h4
2 files changed, 9 insertions, 4 deletions
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index 9005e8b35..6fae8deaa 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -91,6 +91,7 @@ SocialWindow::SocialWindow() :
mTabs(new TabbedArea(this)),
mMap(nullptr),
mLastUpdateTime(0),
+ mPartyId(0),
mNeedUpdate(false),
mProcessedPortals(false)
{
@@ -275,7 +276,7 @@ void SocialWindow::action(const ActionEvent &event)
strprintf(_("Accepted party invite from %s."),
mPartyInviter.c_str()));
}
- partyHandler->inviteResponse(mPartyInviter, true);
+ partyHandler->inviteResponse(mPartyInviter, mPartyId, true);
}
else if (eventId == "no")
{
@@ -286,7 +287,7 @@ void SocialWindow::action(const ActionEvent &event)
strprintf(_("Rejected party invite from %s."),
mPartyInviter.c_str()));
}
- partyHandler->inviteResponse(mPartyInviter, false);
+ partyHandler->inviteResponse(mPartyInviter, mPartyId, false);
}
mPartyInviter.clear();
@@ -431,7 +432,8 @@ void SocialWindow::showGuildInvite(const std::string &restrict guildName,
}
void SocialWindow::showPartyInvite(const std::string &restrict partyName,
- const std::string &restrict inviter)
+ const std::string &restrict inviter,
+ const int partyId)
{
// check there isnt already an invite showing
if (!mPartyInviter.empty())
@@ -486,6 +488,7 @@ void SocialWindow::showPartyInvite(const std::string &restrict partyName,
mPartyAcceptDialog->postInit();
mPartyAcceptDialog->addActionListener(this);
mPartyInviter = inviter;
+ mPartyId = partyId;
}
void SocialWindow::showPartyCreate()
diff --git a/src/gui/windows/socialwindow.h b/src/gui/windows/socialwindow.h
index 80cc38b0e..a2ecc5e8f 100644
--- a/src/gui/windows/socialwindow.h
+++ b/src/gui/windows/socialwindow.h
@@ -76,7 +76,8 @@ class SocialWindow final : public Window,
void showGuildCreate();
void showPartyInvite(const std::string &restrict partyName,
- const std::string &restrict inviter = "");
+ const std::string &restrict inviter,
+ const int partyId);
void showPartyCreate();
@@ -169,6 +170,7 @@ class SocialWindow final : public Window,
Map *mMap;
int mLastUpdateTime;
+ int mPartyId;
bool mNeedUpdate;
bool mProcessedPortals;
};