diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-01-04 18:05:41 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-01-04 18:05:41 +0000 |
| commit | ca8e7b4d7621570ee770dd6114eab9986f13accd (patch) | |
| tree | fe0ed86847b3f9264d352d666fb1e6dcf3a54b6b /src/map/map.c | |
| parent | 38fc07331284161a3833c295dfa3633d3eecfa66 (diff) | |
| download | hercules-ca8e7b4d7621570ee770dd6114eab9986f13accd.tar.gz hercules-ca8e7b4d7621570ee770dd6114eab9986f13accd.tar.bz2 hercules-ca8e7b4d7621570ee770dd6114eab9986f13accd.tar.xz hercules-ca8e7b4d7621570ee770dd6114eab9986f13accd.zip | |
Re-designed /db/ folder structure as previously discussed.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15390 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/map/map.c b/src/map/map.c index 8f7f7efb2..c433857ec 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -3717,6 +3717,12 @@ int do_init(int argc, char *argv[]) } map_config_read(MAP_CONF_NAME); +#if REMODE + /** + * to make pre-re conflict safe + **/ + map_config_read("npc/scripts_renewal.conf"); +#endif chrif_checkdefaultlogin(); if (!map_ip_set || !char_ip_set) { |