summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-06-09 02:04:35 -0300
committershennetsind <ind@henn.et>2013-06-09 02:04:35 -0300
commit74d9eeee60543806e8902812349bcc67e1ddead1 (patch)
tree9e5b4c6e80048becc4e5c3e54c19626f67745595 /src/map
parentb15841ec20dd18f5e126033604de9f6f97a2190f (diff)
parentde8b0185c61ff017bb22ffc17754a6711356bd9f (diff)
downloadhercules-74d9eeee60543806e8902812349bcc67e1ddead1.tar.gz
hercules-74d9eeee60543806e8902812349bcc67e1ddead1.tar.bz2
hercules-74d9eeee60543806e8902812349bcc67e1ddead1.tar.xz
hercules-74d9eeee60543806e8902812349bcc67e1ddead1.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.h2
-rw-r--r--src/map/clif.c24
-rw-r--r--src/map/packets.h34
3 files changed, 42 insertions, 18 deletions
diff --git a/src/map/battle.h b/src/map/battle.h
index 707868e43..f2d870032 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -67,7 +67,7 @@ enum e_battle_check_target { //New definitions [Skotlex]
BCT_NOPARTY = 0x1b0000, // This should be (~BCT_PARTY&BCT_ALL)
BCT_NOENEMY = 0x1d0000, // This should be (~BCT_ENEMY&BCT_ALL)
- BCT_ALL = 0x1f0000, // Sum of BCT_NOONE to BCT_GUILD
+ BCT_ALL = 0x1f0000, // Sum of BCT_NOONE to BCT_NEUTRAL
};
/**
diff --git a/src/map/clif.c b/src/map/clif.c
index f808b00ab..8a33da5e7 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -12462,6 +12462,7 @@ void clif_parse_PartyBookingSubFilteringList(int fd, struct map_session_data *sd
void clif_parse_PartyBookingReqVolunteer(int fd, struct map_session_data *sd)
{
int index = RFIFOL(fd, 2);
+
clif->PartyBookingVolunteerInfo(index, sd);
}
@@ -12470,8 +12471,6 @@ void clif_parse_PartyBookingReqVolunteer(int fd, struct map_session_data *sd)
void clif_PartyBookingVolunteerInfo(int index, struct map_session_data *sd)
{
unsigned char buf[2+4+4+2+24+1];
-
- //sd->pb_index = index;
WBUFW(buf, 0) = 0x8f2;
WBUFL(buf, 2) = sd->status.account_id;
@@ -12499,11 +12498,13 @@ void clif_parse_PartyBookingReqRecall(int fd, struct map_session_data *sd)
}
/// 08f6 <money>.L <map name>.16B
-void clif_PartyBookingRecallCost(int fd, struct map_session_data *sd) {
+void clif_PartyBookingRecallCost(int fd, struct map_session_data *sd)
+{
}
/// 08f7 <result>.B
-void clif_parse_PartyBookingAckRecall(int fd, struct map_session_data *sd) {
+void clif_parse_PartyBookingAckRecall(int fd, struct map_session_data *sd)
+{
}
/// 08f8 <caller AID>.L <reason>.B
@@ -12530,13 +12531,9 @@ void clif_parse_PartyBookingRefuseVolunteer(int fd, struct map_session_data *sd)
void clif_PartyBookingRefuseVolunteer(unsigned long aid, struct map_session_data *sd)
{
unsigned char buf[2+6];
-
- //handle
- //if (aid != sd->status.account_id)
- // ;
WBUFW(buf, 0) = 0x8fa;
- WBUFL(buf, 2) = aid;//sd->pb_index;
+ WBUFL(buf, 2) = aid;
clif->send(buf, packet_len(0x8fa), &sd->bl, ALL_CLIENT);
}
@@ -12564,9 +12561,7 @@ void clif_PartyBookingCancelVolunteer(int index, struct map_session_data *sd)
void clif_PartyBookingAddFilteringList(int index, struct map_session_data *sd)
{
unsigned char buf[2+6+24+1];
-
- //sd->pb_index = index;
-
+
WBUFW(buf, 0) = 0x90b;
WBUFL(buf, 2) = sd->bl.id;
memcpy(WBUFP(buf, 6), sd->status.name, NAME_LENGTH);
@@ -12577,7 +12572,6 @@ void clif_PartyBookingAddFilteringList(int index, struct map_session_data *sd)
/// 090c <gid>.L <char name>.24B
void clif_PartyBookingSubFilteringList(int gid, struct map_session_data *sd)
{
- //struct map_session_data *ssd = mapid2sd(gid);
unsigned char buf[2+6+24+1];
WBUFW(buf, 0) = 0x90c;
@@ -12591,15 +12585,11 @@ void clif_PartyBookingSubFilteringList(int gid, struct map_session_data *sd)
/// 091c <aid>.L
void clif_PartyBookingCancelVolunteerToPM(struct map_session_data *sd)
{
- /* this+0x0 */ short PacketType;
- /* this+0x2 */ unsigned long AID;
}
/// 0971 <pm_aid>.L
void clif_PartyBookingRefuseVolunteerToPM(struct map_session_data *sd)
{
- /* this+0x0 */ short PacketType;
- /* this+0x2 */ unsigned long PM_AID;
}
#endif //if 0
#endif
diff --git a/src/map/packets.h b/src/map/packets.h
index 0c68a407b..4f2b119fb 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -2164,6 +2164,7 @@ packet(0x020d,-1);
// Shuffle End
#endif
+//2013-05-29Ragexe (Shakto)
#if PACKETVER >= 20130529
packet(0x0890,7,clif->pActionRequest,2,6);
packet(0x0438,10,clif->pUseSkillToId,2,4,6);
@@ -2196,4 +2197,37 @@ packet(0x020d,-1);
packet(0x0956,36,clif->pStoragePassword,0);
#endif
+//2013-06-05Ragexe (Shakto)
+#if PACKETVER >= 20130605
+ packet(0x0369,7,clif->pActionRequest,2,6);
+ packet(0x083C,10,clif->pUseSkillToId,2,4,6);
+ packet(0x0437,5,clif->pWalkToXY,2);
+ packet(0x035F,6,clif->pTickSend,2);
+ packet(0x0202,5,clif->pChangeDir,2,4);
+ packet(0x07E4,6,clif->pTakeItem,2);
+ packet(0x0362,6,clif->pDropItem,2,4);
+ packet(0x07EC,8,clif->pMoveToKafra,2,4);
+ packet(0x0364,8,clif->pMoveFromKafra,2,4);
+ packet(0x0438,10,clif->pUseSkillToPos,2,4,6,8);
+ packet(0x0366,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+ packet(0x096A,6,clif->pGetCharNameRequest,2);
+ packet(0x0368,6,clif->pSolveCharName,2);
+ packet(0x0838,12,clif->pSearchStoreInfoListItemClick,2,6,10);
+ packet(0x0835,2,clif->pSearchStoreInfoNextPage,0);
+ packet(0x0819,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+ packet(0x0811,-1,clif->pReqTradeBuyingStore,2,4,8,12);
+ packet(0x0360,6,clif->pReqClickBuyingStore,2);
+ packet(0x0817,2,clif->pReqCloseBuyingStore,0);
+ packet(0x0815,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);
+ packet(0x0365,41,clif->pPartyBookingRegisterReq,2,4);
+ // packet(0x0363,8); // CZ_JOIN_BATTLE_FIELD
+ packet(0x0281,-1,clif->pItemListWindowSelected,2,4,8);
+ packet(0x022D,19,clif->pWantToConnection,2,6,10,14,18);
+ packet(0x0802,26,clif->pPartyInvite2,2);
+ // packet(0x0436,4); // CZ_GANGSI_RANK
+ packet(0x023B,26,clif->pFriendsListAdd,2);
+ packet(0x0361,5,clif->pHomMenu,2,4);
+ packet(0x0883,36,clif->pStoragePassword,0);
+#endif
+
#endif /* _PACKETS_H_ */