diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/config/classes/general.h (renamed from src/map/config/classes/general.h) | 0 | ||||
| -rw-r--r-- | src/config/classes/swordsman.h (renamed from src/map/config/classes/swordsman.h) | 0 | ||||
| -rw-r--r-- | src/config/const.h (renamed from src/map/config/const.h) | 0 | ||||
| -rw-r--r-- | src/config/core.h (renamed from src/map/config/core.h) | 0 | ||||
| -rw-r--r-- | src/config/renewal.h (renamed from src/map/config/renewal.h) | 0 | ||||
| -rw-r--r-- | src/config/secure.h (renamed from src/map/config/secure.h) | 0 | ||||
| -rw-r--r-- | src/map/Makefile.in | 4 | ||||
| -rw-r--r-- | src/map/map.c | 10 | ||||
| -rw-r--r-- | src/map/map.h | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 2 |
10 files changed, 10 insertions, 8 deletions
diff --git a/src/map/config/classes/general.h b/src/config/classes/general.h index a2c9c64c3..a2c9c64c3 100644 --- a/src/map/config/classes/general.h +++ b/src/config/classes/general.h diff --git a/src/map/config/classes/swordsman.h b/src/config/classes/swordsman.h index 44ae922d5..44ae922d5 100644 --- a/src/map/config/classes/swordsman.h +++ b/src/config/classes/swordsman.h diff --git a/src/map/config/const.h b/src/config/const.h index 85a76b1ab..85a76b1ab 100644 --- a/src/map/config/const.h +++ b/src/config/const.h diff --git a/src/map/config/core.h b/src/config/core.h index 848829ea2..848829ea2 100644 --- a/src/map/config/core.h +++ b/src/config/core.h diff --git a/src/map/config/renewal.h b/src/config/renewal.h index c169c5642..c169c5642 100644 --- a/src/map/config/renewal.h +++ b/src/config/renewal.h diff --git a/src/map/config/secure.h b/src/config/secure.h index e2b000440..e2b000440 100644 --- a/src/map/config/secure.h +++ b/src/config/secure.h diff --git a/src/map/Makefile.in b/src/map/Makefile.in index 06925bcec..a1f1bbd03 100644 --- a/src/map/Makefile.in +++ b/src/map/Makefile.in @@ -26,8 +26,8 @@ MAP_H = map.h chrif.h clif.h pc.h status.h npc.h \ intif.h trade.h party.h vending.h guild.h pet.h \ log.h mail.h date.h unit.h homunculus.h mercenary.h quest.h instance.h mapreg.h \ buyingstore.h searchstore.h duel.h pc_groups.h \ - config/core.h config/renewal.h config/secure.h config/const.h \ - config/classes/general.h config/classes/swordsman.h elemental.h + ../config/core.h ../config/renewal.h ../config/secure.h ../config/const.h \ + ../config/classes/general.h ../config/classes/swordsman.h elemental.h HAVE_MYSQL=@HAVE_MYSQL@ ifeq ($(HAVE_MYSQL),yes) 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) { diff --git a/src/map/map.h b/src/map/map.h index 2095caf44..fd13bf467 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -13,7 +13,7 @@ /** * [rAthena.org] **/ -#include "./config/core.h" +#include "../config/core.h" #include <stdarg.h> diff --git a/src/map/skill.c b/src/map/skill.c index 9e7b5711a..c9d71af7f 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -13024,8 +13024,8 @@ int skill_castfix (struct block_list *bl, int skill_id, int skill_lv) *------------------------------------------*/ int skill_castfix_sc (struct block_list *bl, int time, int skill_id, int skill_lv) { struct status_change *sc = status_get_sc(bl); - struct map_session_data *sd = BL_CAST(BL_PC,bl); #ifdef RENEWAL_CAST + struct map_session_data *sd = BL_CAST(BL_PC,bl); int fixed = skill_get_fixed_cast(skill_id, skill_lv); if( !fixed ) { fixed = skill_get_cast(skill_id, skill_lv); |