summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZephiris <Zephiris@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-03 18:09:24 +0000
committerZephiris <Zephiris@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-03 18:09:24 +0000
commitb66c4739b8a524efcd8d848265bd6f73d08db6c4 (patch)
tree397422325ae7f84278ec85d2ed3e26d65ea344a5
parent9d73a996d9edba1da1f36461f3838d5571a781a3 (diff)
downloadhercules-b66c4739b8a524efcd8d848265bd6f73d08db6c4.tar.gz
hercules-b66c4739b8a524efcd8d848265bd6f73d08db6c4.tar.bz2
hercules-b66c4739b8a524efcd8d848265bd6f73d08db6c4.tar.xz
hercules-b66c4739b8a524efcd8d848265bd6f73d08db6c4.zip
* Fixed character deletion working on SQL without an email address (Thanks to Valaris) [Zephiris]
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5449 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/char_sql/char.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index c39945916..aaa68d8fd 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/03/03
+ * Fixed character deletion working on SQL without an email address (Thanks to Valaris) [Zephiris]
* Added event 8 for mobspawns that should spawn with special ai set. This
means that now in the mob_spawn files if you use 8 as the last entry, the
mob will use the special ai, and as such, it will only attack other mobs,
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index ea26de414..6d1ea1959 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -1860,6 +1860,7 @@ int parse_tologin(int fd) {
for(i = 0; i < fd_max; i++) {
if (session[i] && (sd = (struct char_session_data*)session[i]->session_data)) {
if (sd->account_id == RFIFOL(fd,2)) {
+ memcpy(sd->email, RFIFOP(fd, 6), 40);
sd->connect_until_time = (time_t)RFIFOL(fd,46);
break;
}