diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-08 19:30:07 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-08 19:30:07 +0000 |
| commit | 31825ccc2dde034a218d9ad466dd721c40b5651d (patch) | |
| tree | 961b976e45988f7f7158d33b3f11a18688f34b1f /src/map/map.c | |
| parent | 22c75b070526de8b103032f5bf13504af81e0095 (diff) | |
| download | hercules-31825ccc2dde034a218d9ad466dd721c40b5651d.tar.gz hercules-31825ccc2dde034a218d9ad466dd721c40b5651d.tar.bz2 hercules-31825ccc2dde034a218d9ad466dd721c40b5651d.tar.xz hercules-31825ccc2dde034a218d9ad466dd721c40b5651d.zip | |
Okie ladies and gentleman if this commit breaks anything it's jman's and maki's fault, yes, blame them.
Fixing pre-re / re npc support, moving /config/ folder to src root so other servers may also make use of the #define renewal dir and other stuff.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16382 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/map/map.c b/src/map/map.c index 3831f7e98..de71d0e84 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -3840,12 +3840,14 @@ int do_init(int argc, char *argv[]) } map_config_read(MAP_CONF_NAME); + /* only temporary until sirius's datapack patch is complete */ + #ifdef RENEWAL - /** - * to make pre-re conflict safe - **/ - map_config_read("npc/scripts_renewal.conf"); + map_config_read("npc/re/scripts_main.conf"); +#else + map_config_read("npc/pre-re/scripts_main.conf"); #endif + chrif_checkdefaultlogin(); if (!map_ip_set || !char_ip_set) { |