summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/login_sql/login.c2
-rw-r--r--src/map/storage.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 7ed26b6fc..b2dd8b931 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ 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/12
+ * Fixed the IP value being apparently incorrectly casted before inserting
+ into the loginlog table on "connect success" events. [Skotlex]
* Fixed Cart Termination's damage. [Skotlex]
* Added the missing check to remove character from memory when logging out
and using the charsave_method which saves character map-server-side.
diff --git a/src/login_sql/login.c b/src/login_sql/login.c
index 237ab2a0d..9be95051a 100644
--- a/src/login_sql/login.c
+++ b/src/login_sql/login.c
@@ -1595,7 +1595,7 @@ int parse_login(int fd) {
} else {
if (p[0] != 127 && log_login) {
- sprintf(tmpsql,"INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '%lu', '%s','100', 'login ok')", loginlog_db, (ulong)p, t_uid);
+ sprintf(tmpsql,"INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '%lu', '%s','100', 'login ok')", loginlog_db, *((ulong *)p), t_uid);
//query
if(mysql_query(&mysql_handle, tmpsql)) {
ShowSQL("DB error - %s\n",mysql_error(&mysql_handle));
diff --git a/src/map/storage.c b/src/map/storage.c
index 3cdeb5b42..a6bf5e026 100644
--- a/src/map/storage.c
+++ b/src/map/storage.c
@@ -718,8 +718,8 @@ int storage_guild_storageclose(struct map_session_data *sd)
chrif_save(sd, 0); //This one also saves the storage. [Skotlex]
else
storage_guild_storagesave(sd->status.account_id, sd->status.guild_id,0);
+ stor->storage_status=0;
}
- stor->storage_status=0;
sd->state.storage_flag = 0;
return 0;