diff options
| author | Paradox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-11-10 03:55:52 +0000 |
|---|---|---|
| committer | Paradox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-11-10 03:55:52 +0000 |
| commit | 84cdcd0f78c162511734466e1d1a37078ee1a786 (patch) | |
| tree | 97b309e74a2e894856d38ab5a7b10dfd90fa717e | |
| parent | c85c24d3aa737236c15c4690b3b43d860567eac7 (diff) | |
| download | hercules-84cdcd0f78c162511734466e1d1a37078ee1a786.tar.gz hercules-84cdcd0f78c162511734466e1d1a37078ee1a786.tar.bz2 hercules-84cdcd0f78c162511734466e1d1a37078ee1a786.tar.xz hercules-84cdcd0f78c162511734466e1d1a37078ee1a786.zip | |
Use packet 0xe7 instead of 0x1f5 within clif_tradestart() when there is no trade_partner (or an invalid one) specified even for PACKETVER >= 6. (bugreport:4544)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14454 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Renewal.txt | 1 | ||||
| -rw-r--r-- | src/map/clif.c | 29 |
2 files changed, 14 insertions, 16 deletions
diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt index 43e4fce54..116b45980 100644 --- a/Changelog-Renewal.txt +++ b/Changelog-Renewal.txt @@ -1,6 +1,7 @@ Date Added 2010/11/09 + * Use packet 0xe7 instead of 0x1f5 within clif_tradestart() when there is no trade_partner (or an invalid one) specified even for PACKETVER >= 6. (bugreport:4544) [Paradox924X] * Follow-up to r14368. Load last_map from SQL on char load so the information is available during char select for PACKETVER > 20100721. Patch based on Ai4rei's. (bugreport:4429) [Paradox924X] 2010/11/08 * Notify players involved in a trade that it has been canceled when one player changes maps/logs out or otherwise becomes unable to participate in the trade. [Paradox924X] diff --git a/src/map/clif.c b/src/map/clif.c index 013b41376..94c19287a 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -3477,23 +3477,20 @@ void clif_traderequest(struct map_session_data* sd, const char* name) void clif_tradestart(struct map_session_data* sd, uint8 type) { int fd = sd->fd; - -#if PACKETVER < 6 - WFIFOHEAD(fd,packet_len(0xe7)); - WFIFOW(fd,0) = 0xe7; - WFIFOB(fd,2) = type; - WFIFOSET(fd,packet_len(0xe7)); -#else struct map_session_data* tsd = map_id2sd(sd->trade_partner); - if( !tsd ) return; - - WFIFOHEAD(fd,packet_len(0x1f5)); - WFIFOW(fd,0) = 0x1f5; - WFIFOB(fd,2) = type; - WFIFOL(fd,3) = tsd->status.char_id; - WFIFOW(fd,7) = tsd->status.base_level; - WFIFOSET(fd,packet_len(0x1f5)); -#endif + if( PACKETVER < 6 || !tsd ) { + WFIFOHEAD(fd,packet_len(0xe7)); + WFIFOW(fd,0) = 0xe7; + WFIFOB(fd,2) = type; + WFIFOSET(fd,packet_len(0xe7)); + } else { + WFIFOHEAD(fd,packet_len(0x1f5)); + WFIFOW(fd,0) = 0x1f5; + WFIFOB(fd,2) = type; + WFIFOL(fd,3) = tsd->status.char_id; + WFIFOW(fd,7) = tsd->status.base_level; + WFIFOSET(fd,packet_len(0x1f5)); + } } /*========================================== |