summaryrefslogtreecommitdiff
path: root/src/map/map.c
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2008-12-05 21:47:26 -0700
committerFate <fate-tmw@googlemail.com>2008-12-05 21:47:26 -0700
commitb2718e6b40767b0b898ed165de29f1621e974b07 (patch)
tree0989a1e2638b0ed3f079685f7136918a5758eea1 /src/map/map.c
parentcc8781ddac1b0dd6d67182f3e9b553ea163e43b7 (diff)
parenta444f55f1448cfb3b14f9019fd73b684e6a9f322 (diff)
downloadtmwa-b2718e6b40767b0b898ed165de29f1621e974b07.tar.gz
tmwa-b2718e6b40767b0b898ed165de29f1621e974b07.tar.bz2
tmwa-b2718e6b40767b0b898ed165de29f1621e974b07.tar.xz
tmwa-b2718e6b40767b0b898ed165de29f1621e974b07.zip
Merge branch 'master' into exp
Diffstat (limited to 'src/map/map.c')
-rw-r--r--src/map/map.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/map/map.c b/src/map/map.c
index 30b9d78..3db293c 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1648,6 +1648,8 @@ int map_delmap(char *mapname) {
return 0;
}
+extern char *gm_logfile_name;
+
/*==========================================
* 設定ファイルを読み込む
*------------------------------------------
@@ -1715,6 +1717,8 @@ int map_config_read(char *cfgName) {
strcpy(help_txt, w2);
} else if (strcmpi(w1, "mapreg_txt") == 0) {
strcpy(mapreg_txt, w2);
+ } else if (strcmpi(w1, "gm_log") == 0) {
+ gm_logfile_name = strdup(w2);
} else if (strcmpi(w1, "import") == 0) {
map_config_read(w2);
}