summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-01-08 12:19:07 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-01-08 12:19:07 +0000
commit5666e2aeec32ec097aec558738d837e8c5bb941f (patch)
tree93456178057028a877488e7a3504cd6a821c781d
parent421db4f7e06284e3563f1fe9e22a8f054ab83b52 (diff)
downloadhercules-5666e2aeec32ec097aec558738d837e8c5bb941f.tar.gz
hercules-5666e2aeec32ec097aec558738d837e8c5bb941f.tar.bz2
hercules-5666e2aeec32ec097aec558738d837e8c5bb941f.tar.xz
hercules-5666e2aeec32ec097aec558738d837e8c5bb941f.zip
* Applied fix provided by Valaris to make /pvpinfo actually work. (bugreport:1785, since r1602).
- Filled-in missing packet fields and documented the packet. Note, that this command does not show anything outside of PvP maps (client-side limitation). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14657 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--db/packet_db.txt2
-rw-r--r--src/map/clif.c11
3 files changed, 9 insertions, 6 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 1f405142f..64bdeef6c 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,6 +1,8 @@
Date Added
2011/01/08
+ * Applied fix provided by Valaris to make /pvpinfo actually work. (bugreport:1785, since r1602). [Ai4rei]
+ - Filled-in missing packet fields and documented the packet. Note, that this command does not show anything outside of PvP maps (client-side limitation).
* Fixed @homlevel usage message stating, that deleveling is possible, although it is not (bugreport:1485, since r10272). [Ai4rei]
- The command now fails, if it is given a zero or negative value.
2011/01/07
diff --git a/db/packet_db.txt b/db/packet_db.txt
index f18eed246..2bd70e641 100644
--- a/db/packet_db.txt
+++ b/db/packet_db.txt
@@ -506,7 +506,7 @@ packet_ver: 9
0x0214,42
//2004-08-17aSakexe
-0x020f,10
+0x020f,10,pvpinfo,2:6
0x0210,22
//2004-09-06aSakexe
diff --git a/src/map/clif.c b/src/map/clif.c
index 36b72788d..0a93895a9 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -12098,20 +12098,20 @@ void clif_parse_FriendsListRemove(int fd, struct map_session_data *sd)
}
/*==========================================
- * /pvpinfo
+ * /pvpinfo (CZ_REQ_PVPPOINT & ZC_ACK_PVPPOINT)
+ * R 020f <char id>.L <account id>.L
+ * S 0210 <char id>.L <account id>.L <win point>.L <lose point>.L <point>.L
*------------------------------------------*/
void clif_parse_PVPInfo(int fd,struct map_session_data *sd)
{
WFIFOHEAD(fd,packet_len(0x210));
WFIFOW(fd,0) = 0x210;
- //WFIFOL(fd,2) = 0; // not sure what for yet
- //WFIFOL(fd,6) = 0;
+ WFIFOL(fd,2) = sd->status.char_id;
+ WFIFOL(fd,6) = sd->status.account_id;
WFIFOL(fd,10) = sd->pvp_won; // times won
WFIFOL(fd,14) = sd->pvp_lost; // times lost
WFIFOL(fd,18) = sd->pvp_point;
WFIFOSET(fd, packet_len(0x210));
-
- return;
}
/*==========================================
@@ -14601,6 +14601,7 @@ static int packetdb_readdb(void)
{clif_parse_PartyBookingUpdateReq,"bookingupdatereq"},
{clif_parse_PartyBookingDeleteReq,"bookingdelreq"},
#endif
+ {clif_parse_PVPInfo,"pvpinfo"},
{NULL,NULL}
};