summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-10-10 21:30:59 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-10-10 21:30:59 +0000
commit58c9454036c0e1d7dcad6715c69207bef2a621f1 (patch)
tree66d1c48ce9b12751b7e9cbfd67a01e6e0f501a36
parent00d145ef8a2e658b296de3fbc4ab5918fe4375ae (diff)
downloadhercules-58c9454036c0e1d7dcad6715c69207bef2a621f1.tar.gz
hercules-58c9454036c0e1d7dcad6715c69207bef2a621f1.tar.bz2
hercules-58c9454036c0e1d7dcad6715c69207bef2a621f1.tar.xz
hercules-58c9454036c0e1d7dcad6715c69207bef2a621f1.zip
- Fixed crash when char-server sends to a "random" map-server online on connect.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8960 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/char_sql/char.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 6dea4ec57..55acb5e47 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/10/09
+ * Fixed crash when char-server sends to a "random" map-server online on
+ connect. Thanks to TheUltraMage for pointing it out. [Skotlex]
* Should have fixed being petrified not reducing your defense and
increaseing your mdef. [Skotlex]
* Fixed SC_NOCHAT printing the "skills are now available" message twice on
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index affdd3a62..629bbade8 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -3310,7 +3310,7 @@ int parse_char(int fd) {
for(j = 0; j < MAX_MAP_SERVERS; j++)
if (server_fd[j] > 0 && server[j].map[0]) {
i = j;
- ShowDebug("Map-server #%d found with a map: '%s'.\n", j, server[j].map[0]);
+ ShowDebug("Map-server #%d found with a map: '%s'.\n", j, mapindex_id2name(server[j].map[0]));
break;
}
// if no map-servers are connected, we send: server closed