summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormalufett <malufett.eat.my.binaries@gmail.com>2015-04-14 07:11:51 +0800
committermalufett <malufett.eat.my.binaries@gmail.com>2015-04-14 07:11:51 +0800
commit37d2e16557b1cd9ee755e2792e20ad629d3fcef9 (patch)
tree9e4592252a17be451ce627ee3009ad44bf4bfd10
parent5a5cd068fdf3b9774f63950a4e89f438fc17fab7 (diff)
parent1f427df3fb8526ddde2e1b96250e148451240870 (diff)
downloadhercules-37d2e16557b1cd9ee755e2792e20ad629d3fcef9.tar.gz
hercules-37d2e16557b1cd9ee755e2792e20ad629d3fcef9.tar.bz2
hercules-37d2e16557b1cd9ee755e2792e20ad629d3fcef9.tar.xz
hercules-37d2e16557b1cd9ee755e2792e20ad629d3fcef9.zip
Merge pull request #496 from 4144/fix8620
Fix issue http://hercules.ws/board/tracker/issue-8620-error-in-quest/
-rw-r--r--src/char/int_quest.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/char/int_quest.c b/src/char/int_quest.c
index 1d64f48a3..036229edd 100644
--- a/src/char/int_quest.c
+++ b/src/char/int_quest.c
@@ -246,14 +246,15 @@ int mapif_parse_quest_save(int fd)
void mapif_send_quests(int fd, int char_id, struct quest *tmp_questlog, int num_quests)
{
- nullpo_retv(tmp_questlog);
WFIFOHEAD(fd,num_quests*sizeof(struct quest)+8);
WFIFOW(fd,0) = 0x3860;
WFIFOW(fd,2) = num_quests*sizeof(struct quest)+8;
WFIFOL(fd,4) = char_id;
- if (num_quests > 0)
+ if (num_quests > 0) {
+ nullpo_retv(tmp_questlog);
memcpy(WFIFOP(fd,8), tmp_questlog, sizeof(struct quest)*num_quests);
+ }
WFIFOSET(fd,num_quests*sizeof(struct quest)+8);
}