diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/map.c | 14 | ||||
| -rw-r--r-- | src/map/map.h | 2 | ||||
| -rw-r--r-- | src/map/mob.c | 16 |
3 files changed, 26 insertions, 6 deletions
diff --git a/src/map/map.c b/src/map/map.c index e5574eaf7..25d7ce692 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -3722,15 +3722,19 @@ int inter_config_read(char *cfgName) { if(strcmpi(w1,"item_db_db")==0) strcpy(map->item_db_db,w2); else if(strcmpi(w1,"mob_db_db")==0) - strcpy(map->mob_db_db,w2); + strcpy(map->mob_db_db, w2); + else if (strcmpi(w1, "mob_db_re_db") == 0) + strcpy(map->mob_db_re_db, w2); else if(strcmpi(w1,"item_db2_db")==0) strcpy(map->item_db2_db,w2); else if(strcmpi(w1,"item_db_re_db")==0) strcpy(map->item_db_re_db,w2); else if(strcmpi(w1,"mob_db2_db")==0) - strcpy(map->mob_db2_db,w2); - else if(strcmpi(w1,"mob_skill_db_db")==0) - strcpy(map->mob_skill_db_db,w2); + strcpy(map->mob_db2_db, w2); + else if(strcmpi(w1, "mob_skill_db_db") == 0) + strcpy(map->mob_skill_db_db, w2); + else if(strcmpi(w1, "mob_skill_db_re_db") == 0) + strcpy(map->mob_skill_db_re_db, w2); else if(strcmpi(w1,"mob_skill_db2_db")==0) strcpy(map->mob_skill_db2_db,w2); else if(strcmpi(w1,"interreg_db")==0) @@ -6005,8 +6009,10 @@ void map_defaults(void) { sprintf(map->item_db2_db, "item_db2"); sprintf(map->item_db_re_db, "item_db_re"); sprintf(map->mob_db_db, "mob_db"); + sprintf(map->mob_db_re_db, "mob_db_re"); sprintf(map->mob_db2_db, "mob_db2"); sprintf(map->mob_skill_db_db, "mob_skill_db"); + sprintf(map->mob_skill_db_re_db, "mob_skill_db_re"); sprintf(map->mob_skill_db2_db, "mob_skill_db2"); sprintf(map->interreg_db, "interreg"); diff --git a/src/map/map.h b/src/map/map.h index 9a5fa8ba3..447437cf4 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -846,8 +846,10 @@ struct map_interface { char item_db2_db[32]; char item_db_re_db[32]; char mob_db_db[32]; + char mob_db_re_db[32]; char mob_db2_db[32]; char mob_skill_db_db[32]; + char mob_skill_db_re_db[32]; char mob_skill_db2_db[32]; char interreg_db[32]; char autotrade_merchants_db[32]; diff --git a/src/map/mob.c b/src/map/mob.c index 8fe3e3cef..4db8cb2f6 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -3942,7 +3942,13 @@ void mob_readdb(void) { * mob_db table reading *------------------------------------------*/ int mob_read_sqldb(void) { - const char* mob_db_name[] = { map->mob_db_db, map->mob_db2_db }; + const char* mob_db_name[] = { +#ifdef RENEWAL + map->mob_db_re_db +#else + map->mob_db_db +#endif + , map->mob_db2_db }; int fi; for( fi = 0; fi < ARRAYLENGTH(mob_db_name); ++fi ) { @@ -4515,7 +4521,13 @@ void mob_readskilldb(void) { * seems to work though... */ int mob_read_sqlskilldb(void) { - const char* mob_skill_db_name[] = { map->mob_skill_db_db, map->mob_skill_db2_db }; + const char* mob_skill_db_name[] = { +#ifdef RENEWAL + map->mob_skill_db_re_db +#else + map->mob_skill_db_db +#endif + , map->mob_skill_db2_db }; int fi; if( battle_config.mob_skill_rate == 0 ) { |