summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-01-24 22:08:15 +0000
committeramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-01-24 22:08:15 +0000
commit67465c1e3f4be97fe2c2a9815b27bc9e356db238 (patch)
treef9ff917dc28057701f305cbb26131e7295bf95d1
parentae90d3e5a0090f15c68246b94e39730ff75f935a (diff)
downloadhercules-67465c1e3f4be97fe2c2a9815b27bc9e356db238.tar.gz
hercules-67465c1e3f4be97fe2c2a9815b27bc9e356db238.tar.bz2
hercules-67465c1e3f4be97fe2c2a9815b27bc9e356db238.tar.xz
hercules-67465c1e3f4be97fe2c2a9815b27bc9e356db238.zip
Fixed compile warning
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@985 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog.txt2
-rw-r--r--src/char/char.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/Changelog.txt b/Changelog.txt
index 45e664da1..3ac89c34a 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,6 +1,8 @@
Date Added
01/24
+ * Fixed another compile warning in src/char/char.c
+ [SVN 985] [MouseJstr]
* Fixed a account wipe bug in login/login.c (Thanks Wallex)
[SVN 984] [MouseJstr]
* Fixed a crash in char_sql/char.c where people were selecting
diff --git a/src/char/char.c b/src/char/char.c
index d851ea854..45eb48389 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -2559,7 +2559,9 @@ int parse_char(int fd) {
else
printf("Account Logged On; Account ID: %d.\n", RFIFOL(fd,2));
if (sd == NULL) {
- sd = (struct char_session_data*)session[fd]->session_data = (struct char_session_data*)aCalloc(sizeof(struct char_session_data), 1);
+ sd = (struct char_session_data*)aCalloc(sizeof(struct char_session_data), 1);
+ session[fd]->session_data = sd;
+
memset(sd, 0, sizeof(struct char_session_data));
memcpy(sd->email, "no mail", 40); // put here a mail without '@' to refuse deletion if we don't receive the e-mail
sd->connect_until_time = 0; // unknow or illimited (not displaying on map-server)