summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-10 03:02:31 +0000
committerLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-10 03:02:31 +0000
commit662b99b94ea5e8934be006a1365c090b034a22ee (patch)
treeddadcb63722426662026c1d7d0c88b760e70e26b
parent2494b69c92ab49c8680d0533af2c90b7a9fc5613 (diff)
downloadhercules-662b99b94ea5e8934be006a1365c090b034a22ee.tar.gz
hercules-662b99b94ea5e8934be006a1365c090b034a22ee.tar.bz2
hercules-662b99b94ea5e8934be006a1365c090b034a22ee.tar.xz
hercules-662b99b94ea5e8934be006a1365c090b034a22ee.zip
* Fixed map_readafm missing strcpy(afm_name, m->name).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7080 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/map.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index e720240d1..0a5cd1b5c 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ 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/06/09
+ * Fixed map_readafm missing strcpy(afm_name, m->name). [Skotlex]
* [Improved]:
- npc_click interception on BL_MOB and BL_PC to let sd act accordingly.
[Lance]
diff --git a/src/map/map.c b/src/map/map.c
index 28bdd5148..ef137b965 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -2838,6 +2838,8 @@ int map_readafm (struct map_data *m)
// check if it's necessary to replace the extension - speeds up loading a bit
strncpy(afm_name, m->name, strlen(m->name) - 4);
strcat(afm_name, ".afm");
+ } else {
+ strcpy(afm_name, m->name);
}
sprintf(fn, "%s\\%s", afm_dir, afm_name);