summaryrefslogtreecommitdiff
path: root/src/net/tmwa
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/tmwa')
-rw-r--r--src/net/tmwa/beingrecv.cpp8
-rw-r--r--src/net/tmwa/beingrecv.h2
-rw-r--r--src/net/tmwa/packetsin.inc2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp
index 555b9b950..012042b00 100644
--- a/src/net/tmwa/beingrecv.cpp
+++ b/src/net/tmwa/beingrecv.cpp
@@ -1312,12 +1312,12 @@ void BeingRecv::processBeingResurrect(Net::MessageIn &msg)
BLOCK_END("BeingRecv::processBeingResurrect")
}
-void BeingRecv::processPlayerGuilPartyInfo(Net::MessageIn &msg)
+void BeingRecv::processPlayerGuildAndPartyInfo(Net::MessageIn &msg)
{
- BLOCK_START("BeingRecv::processPlayerGuilPartyInfo")
+ BLOCK_START("BeingRecv::processPlayerGuildAndPartyInfo")
if (actorManager == nullptr)
{
- BLOCK_END("BeingRecv::processPlayerGuilPartyInfo")
+ BLOCK_END("BeingRecv::processPlayerGuildAndPartyInfo")
return;
}
@@ -1347,7 +1347,7 @@ void BeingRecv::processPlayerGuilPartyInfo(Net::MessageIn &msg)
msg.readString(24, "guild pos");
msg.readString(24, "?");
}
- BLOCK_END("BeingRecv::processPlayerGuilPartyInfo")
+ BLOCK_END("BeingRecv::processPlayerGuildAndPartyInfo")
}
void BeingRecv::processBeingSelfEffect(Net::MessageIn &msg)
diff --git a/src/net/tmwa/beingrecv.h b/src/net/tmwa/beingrecv.h
index 7019e83fb..55e5773c5 100644
--- a/src/net/tmwa/beingrecv.h
+++ b/src/net/tmwa/beingrecv.h
@@ -66,7 +66,7 @@ namespace TmwAthena
const int id2) A_NONNULL(2);
void processPlayerStatusChange(Net::MessageIn &msg);
void processBeingResurrect(Net::MessageIn &msg);
- void processPlayerGuilPartyInfo(Net::MessageIn &msg);
+ void processPlayerGuildAndPartyInfo(Net::MessageIn &msg);
void processBeingSelfEffect(Net::MessageIn &msg);
void processSkillCastCancel(Net::MessageIn &msg);
void processIpResponse(Net::MessageIn &msg);
diff --git a/src/net/tmwa/packetsin.inc b/src/net/tmwa/packetsin.inc
index 87e62ebcf..dbfdbd494 100644
--- a/src/net/tmwa/packetsin.inc
+++ b/src/net/tmwa/packetsin.inc
@@ -91,7 +91,7 @@ packet(SMSG_PLAYER_ATTACK_RANGE, 0x013a, 4, &Ea::InventoryRecv::proc
packet(SMSG_PLAYER_CHAT, 0x008e, -1, &ChatRecv::processChat, 0);
packet(SMSG_PLAYER_EQUIP, 0x00aa, 7, &InventoryRecv::processPlayerEquip, 0);
packet(SMSG_PLAYER_EQUIPMENT, 0x00a4, -1, &InventoryRecv::processPlayerEquipment, 0);
-packet(SMSG_PLAYER_GUILD_PARTY_INFO, 0x0195, 102, &BeingRecv::processPlayerGuilPartyInfo, 0);
+packet(SMSG_PLAYER_GUILD_PARTY_INFO, 0x0195, 102, &BeingRecv::processPlayerGuildAndPartyInfo, 0);
packet(SMSG_PLAYER_INVENTORY, 0x01ee, -1, &InventoryRecv::processPlayerInventory, 0);
packet(SMSG_PLAYER_INVENTORY_ADD, 0x00a0, 23, &InventoryRecv::processPlayerInventoryAdd, 0);
packet(SMSG_PLAYER_INVENTORY_REMOVE, 0x00af, 6, &InventoryRecv::processPlayerInventoryRemove, 0);