diff options
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/map.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index f5ff2c626..c443ea05b 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,8 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2009/11/26 + * Moved log_sql_init() call up in map-server-init to after after map_sql_init() call to prevent unnecessary processing before a potential quit. [Paradox924X] 2009/11/25 * Fixed strnpcinfo(1) returning blank strings when NPC names did not have a hidden portion of the display name. (bugreport:3758) [Paradox924X] 2009/11/23 diff --git a/src/map/map.c b/src/map/map.c index 7f8a72cd2..dc338c5c6 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -3595,6 +3595,8 @@ int do_init(int argc, char *argv[]) #ifndef TXT_ONLY map_sql_init(); + if (log_config.sql_logs) + log_sql_init(); #endif /* not TXT_ONLY */ mapindex_init(); @@ -3629,10 +3631,6 @@ int do_init(int argc, char *argv[]) do_init_npc(); do_init_unit(); do_init_battleground(); -#ifndef TXT_ONLY /* mail system [Valaris] */ - if (log_config.sql_logs) - log_sql_init(); -#endif /* not TXT_ONLY */ npc_event_do_oninit(); // npcのOnInitイベント?行 |