summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-25 19:29:21 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-25 19:29:21 +0000
commit217c77ca7710dccbf6e753d0cdaf67722ce61a29 (patch)
tree03b36456e9c0d40338d857c90023669c5a4485ee
parent2d4285b733ce76bf0bc5b5bc8f02c673d4fba887 (diff)
downloadhercules-217c77ca7710dccbf6e753d0cdaf67722ce61a29.tar.gz
hercules-217c77ca7710dccbf6e753d0cdaf67722ce61a29.tar.bz2
hercules-217c77ca7710dccbf6e753d0cdaf67722ce61a29.tar.xz
hercules-217c77ca7710dccbf6e753d0cdaf67722ce61a29.zip
- Fixed duel accept invite sending the packet before the duel data is set (resulting in a packet that noone receives). Thanks to Toms for finding it out.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7881 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--src/map/atcommand.c8
2 files changed, 7 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 1fc0d23f4..1b625525f 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/07/25
+ * Fixed duel accept invite sending the packet before the duel data is set
+ (resulting in a packet that noone receives). Thanks to Toms for finding it
+ out. [Skotlex]
* Fixed a possible crash when you dual-wield and the total damage is 0.
[Skotlex]
* Added Toms's perl scripts item_db.pl and mob_db.pl (they are in tools/),
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 347f92d3e..9ff33d152 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -1135,15 +1135,15 @@ int duel_accept(
{
char output[256];
- // " -> Player %s has accepted duel --"
- sprintf(output, msg_txt(376), (unsigned char *)sd->status.name);
- clif_disp_message(&sd->bl, output, strlen(output), DUEL_WOS);
-
duel_list[did].members_count++;
sd->duel_group = sd->duel_invite;
duel_list[did].invites_count--;
sd->duel_invite = 0;
+ // " -> Player %s has accepted duel --"
+ sprintf(output, msg_txt(376), (unsigned char *)sd->status.name);
+ clif_disp_message(&sd->bl, output, strlen(output), DUEL_WOS);
+
clif_set0199(sd->fd, 1);
//clif_misceffect2(&sd->bl, 159);
return 0;