summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/partyhandler.cpp16
-rw-r--r--src/net/eathena/partyhandler.h1
2 files changed, 4 insertions, 13 deletions
diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp
index 452cf1408..ea5b71089 100644
--- a/src/net/eathena/partyhandler.cpp
+++ b/src/net/eathena/partyhandler.cpp
@@ -152,12 +152,13 @@ void PartyHandler::invite(const std::string &name) const
}
void PartyHandler::inviteResponse(const std::string &inviter A_UNUSED,
+ const int partyId,
const bool accept) const
{
if (localPlayer)
{
createOutPacket(CMSG_PARTY_INVITED2);
- outMsg.writeInt32(localPlayer->getId(), "account id");
+ outMsg.writeInt32(partyId, "party id");
outMsg.writeInt8(static_cast<int8_t>(accept ? 1 : 0), "accept");
}
}
@@ -501,20 +502,9 @@ void PartyHandler::processPartyInvited(Net::MessageIn &msg)
{
const int id = msg.readInt32("account id");
const std::string partyName = msg.readString(24, "party name");
- std::string nick;
-
- if (actorManager)
- {
- const Being *const being = actorManager->findBeing(id);
- if (being)
- {
- if (being->getType() == ActorType::Player)
- nick = being->getName();
- }
- }
if (socialWindow)
- socialWindow->showPartyInvite(partyName, nick);
+ socialWindow->showPartyInvite(partyName, "", id);
}
} // namespace EAthena
diff --git a/src/net/eathena/partyhandler.h b/src/net/eathena/partyhandler.h
index f389bcb42..81127f8c8 100644
--- a/src/net/eathena/partyhandler.h
+++ b/src/net/eathena/partyhandler.h
@@ -45,6 +45,7 @@ class PartyHandler final : public MessageHandler, public Ea::PartyHandler
void invite(const std::string &name) const override final;
void inviteResponse(const std::string &inviter,
+ const int partyId,
const bool accept) const override final;
void leave() const override final;