summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFedja Beader <fedja@protonmail.ch>2024-03-25 23:35:10 +0000
committerFedja Beader <fedja@protonmail.ch>2024-03-25 23:35:10 +0000
commit9d3fa3c50c0f0668b20ff0d5b7f760f46290e21c (patch)
tree6f48e06bc837f5bc7bf35bb54e3e205b2232762c
parent6243e38c2f13754d11b750ffee069dd1542f905e (diff)
downloadplus-9d3fa3c50c0f0668b20ff0d5b7f760f46290e21c.tar.gz
plus-9d3fa3c50c0f0668b20ff0d5b7f760f46290e21c.tar.bz2
plus-9d3fa3c50c0f0668b20ff0d5b7f760f46290e21c.tar.xz
plus-9d3fa3c50c0f0668b20ff0d5b7f760f46290e21c.zip
Typofix Guil -> Guild and insert And
See merge request mana/plus!64
-rw-r--r--src/net/eathena/beingrecv.cpp16
-rw-r--r--src/net/eathena/beingrecv.h4
-rw-r--r--src/net/eathena/packetsin.inc8
-rw-r--r--src/net/tmwa/beingrecv.cpp8
-rw-r--r--src/net/tmwa/beingrecv.h2
-rw-r--r--src/net/tmwa/packetsin.inc2
6 files changed, 20 insertions, 20 deletions
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index 7d5e810dc..da175c2e8 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -1747,12 +1747,12 @@ void BeingRecv::processNameResponseTitle(Net::MessageIn &msg)
}
}
-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;
}
@@ -1778,15 +1778,15 @@ void BeingRecv::processPlayerGuilPartyInfo(Net::MessageIn &msg)
msg.readString(24, "guild name");
msg.readString(24, "guild pos");
}
- BLOCK_END("BeingRecv::processPlayerGuilPartyInfo")
+ BLOCK_END("BeingRecv::processPlayerGuildAndPartyInfo")
}
-void BeingRecv::processPlayerGuilPartyInfo2(Net::MessageIn &msg)
+void BeingRecv::processPlayerGuildAndPartyInfo2(Net::MessageIn &msg)
{
- BLOCK_START("BeingRecv::processPlayerGuilPartyInfo2")
+ BLOCK_START("BeingRecv::processPlayerGuildAndPartyInfo2")
if (actorManager == nullptr)
{
- BLOCK_END("BeingRecv::processPlayerGuilPartyInfo2")
+ BLOCK_END("BeingRecv::processPlayerGuildAndPartyInfo2")
return;
}
@@ -1814,7 +1814,7 @@ void BeingRecv::processPlayerGuilPartyInfo2(Net::MessageIn &msg)
}
// +++ need use it for show player title
msg.readInt32("title");
- BLOCK_END("BeingRecv::processPlayerGuilPartyInfo2")
+ BLOCK_END("BeingRecv::processPlayerGuildAndPartyInfo2")
}
void BeingRecv::processBeingRemoveSkill(Net::MessageIn &msg)
diff --git a/src/net/eathena/beingrecv.h b/src/net/eathena/beingrecv.h
index 214a15140..7e414c449 100644
--- a/src/net/eathena/beingrecv.h
+++ b/src/net/eathena/beingrecv.h
@@ -90,8 +90,8 @@ namespace EAthena
void processPlayerStatusChange(Net::MessageIn &msg);
void processBeingResurrect(Net::MessageIn &msg);
void processNameResponseTitle(Net::MessageIn &msg);
- void processPlayerGuilPartyInfo(Net::MessageIn &msg);
- void processPlayerGuilPartyInfo2(Net::MessageIn &msg);
+ void processPlayerGuildAndPartyInfo(Net::MessageIn &msg);
+ void processPlayerGuildAndPartyInfo2(Net::MessageIn &msg);
void processBeingRemoveSkill(Net::MessageIn &msg);
void processBeingFakeName(Net::MessageIn &msg);
void processBeingStatUpdate1(Net::MessageIn &msg);
diff --git a/src/net/eathena/packetsin.inc b/src/net/eathena/packetsin.inc
index 19e31626b..443c583c0 100644
--- a/src/net/eathena/packetsin.inc
+++ b/src/net/eathena/packetsin.inc
@@ -227,7 +227,7 @@ packet(SMSG_PLAYER_ATTACK_RANGE, 0x013a, 4, &Ea::InventoryRecv::proc
packet(SMSG_PLAYER_CART_ADD_ERROR, 0x012c, 3, &InventoryRecv::processCartAddError, 0);
packet(SMSG_PLAYER_CART_REMOVE, 0x0125, 8, &InventoryRecv::processPlayerCartRemove, 0);
packet(SMSG_PLAYER_CHAT, 0x008e, -1, &ChatRecv::processChat, 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_HEAL, 0x013d, 6, &PlayerRecv::processPlayerHeal, 0);
packet(SMSG_PLAYER_IDENTIFIED, 0x0179, 5, &InventoryRecv::processPlayerIdentified, 0);
packet(SMSG_PLAYER_IDENTIFY_LIST, 0x0177, -1, &InventoryRecv::processPlayerIdentifyList, 0);
@@ -972,7 +972,7 @@ if (packetVersionRe >= 20141126)
packet(SMSG_ACHIEVEMENT_LIST, 0x0a23, -1, &AchievementRecv::processAchievementList, 20141126);
packet(SMSG_ACHIEVEMENT_UPDATE, 0x0a24, 66, &AchievementRecv::processAchievementUpdate, 20141126);
packet(SMSG_ACHIEVEMENT_GET_REWARD, 0x0a26, 6, &AchievementRecv::processAchievementGetReward, 20141126);
- packet(SMSG_PLAYER_GUILD_PARTY_INFO, 0x0a30, 106, &BeingRecv::processPlayerGuilPartyInfo2, 20141126);
+ packet(SMSG_PLAYER_GUILD_PARTY_INFO, 0x0a30, 106, &BeingRecv::processPlayerGuildAndPartyInfo2, 20141126);
}
// 0
@@ -1017,7 +1017,7 @@ if (packetVersionMain >= 20150225)
packet(SMSG_ACHIEVEMENT_LIST, 0x0a23, -1, &AchievementRecv::processAchievementList, 20150225);
packet(SMSG_ACHIEVEMENT_UPDATE, 0x0a24, 66, &AchievementRecv::processAchievementUpdate, 20150225);
packet(SMSG_ACHIEVEMENT_GET_REWARD, 0x0a26, 6, &AchievementRecv::processAchievementGetReward, 20150225);
- packet(SMSG_PLAYER_GUILD_PARTY_INFO, 0x0a30, 106, &BeingRecv::processPlayerGuilPartyInfo2, 20150225);
+ packet(SMSG_PLAYER_GUILD_PARTY_INFO, 0x0a30, 106, &BeingRecv::processPlayerGuildAndPartyInfo2, 20150225);
}
// 20150226
@@ -1313,7 +1313,7 @@ if (packets_zero == true)
packet(SMSG_PRIVATE_AIRSHIP_RESPONSE, 0x0A4A, 6, &NpcRecv::processPrivateAirShipResponse, 20171018);
packet(SMSG_ENCHANT_EQUIPMENT, 0x0a3f, 9, &InventoryRecv::processEnchantEquipment, 20171018);
packet(SMSG_GUILD_EXPULSION_LIST, 0x0a87, -1, &GuildRecv::processGuildExpulsionList3, 20171018);
- packet(SMSG_PLAYER_GUILD_PARTY_INFO, 0x0a30, 106, &BeingRecv::processPlayerGuilPartyInfo2, 20171018);
+ packet(SMSG_PLAYER_GUILD_PARTY_INFO, 0x0a30, 106, &BeingRecv::processPlayerGuildAndPartyInfo2, 20171018);
packet(SMSG_NPC_CASH_BUY, 0x0849, 16, &CashShopRecv::processCashShopBuy, 20171018);
packet(SMSG_ROULETTE_CLOSE, 0x0a1e, 3, &RouletteRecv::processRouletteClose, 20171018);
packet(SMSG_MERGE_ITEM, 0x096d, -1, &InventoryRecv::processMergeItem, 20171018);
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);