diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/itemdb.c | 4 | ||||
| -rw-r--r-- | src/map/map.c | 9 | ||||
| -rw-r--r-- | src/map/map.h | 3 | ||||
| -rw-r--r-- | src/map/mob.c | 18 | ||||
| -rw-r--r-- | src/plugins/db2sql.c | 2 |
5 files changed, 7 insertions, 29 deletions
diff --git a/src/map/itemdb.c b/src/map/itemdb.c index 6559005a2..fb6bcc730 100644 --- a/src/map/itemdb.c +++ b/src/map/itemdb.c @@ -2033,11 +2033,7 @@ void itemdb_read(bool minimal) { if (map->db_use_sql_item_db) { const char* item_db_name[] = { -#ifdef RENEWAL - map->item_db_re_db, -#else // not RENEWAL map->item_db_db, -#endif // RENEWAL map->item_db2_db }; for(i = 0; i < ARRAYLENGTH(item_db_name); i++) diff --git a/src/map/map.c b/src/map/map.c index dcc0532dd..ae31f01ec 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -3728,18 +3728,12 @@ int inter_config_read(char *cfgName) { safestrncpy(map->item_db_db, w2, sizeof(map->item_db_db)); else if(strcmpi(w1,"mob_db_db")==0) safestrncpy(map->mob_db_db, w2, sizeof(map->mob_db_db)); - else if (strcmpi(w1, "mob_db_re_db") == 0) - safestrncpy(map->mob_db_re_db, w2, sizeof(map->mob_db_re_db)); else if(strcmpi(w1,"item_db2_db")==0) safestrncpy(map->item_db2_db, w2, sizeof(map->item_db2_db)); - else if(strcmpi(w1,"item_db_re_db")==0) - safestrncpy(map->item_db_re_db, w2, sizeof(map->item_db_re_db)); else if(strcmpi(w1,"mob_db2_db")==0) safestrncpy(map->mob_db2_db, w2, sizeof(map->mob_db2_db)); else if(strcmpi(w1, "mob_skill_db_db") == 0) safestrncpy(map->mob_skill_db_db, w2, sizeof(map->mob_skill_db_db)); - else if(strcmpi(w1, "mob_skill_db_re_db") == 0) - safestrncpy(map->mob_skill_db_re_db, w2, sizeof(map->mob_skill_db_re_db)); else if(strcmpi(w1,"mob_skill_db2_db")==0) safestrncpy(map->mob_skill_db2_db, w2, sizeof(map->mob_skill_db2_db)); else if(strcmpi(w1,"interreg_db")==0) @@ -6051,12 +6045,9 @@ void map_defaults(void) { sprintf(map->item_db_db, "item_db"); 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 a1c6d2cde..3b24872fe 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -852,12 +852,9 @@ struct map_interface { char item_db_db[32]; 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 26cb51ddc..d8898619c 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -3944,12 +3944,9 @@ void mob_readdb(void) { *------------------------------------------*/ int mob_read_sqldb(void) { const char* mob_db_name[] = { -#ifdef RENEWAL - map->mob_db_re_db -#else - map->mob_db_db -#endif - , map->mob_db2_db }; + map->mob_db_db, + map->mob_db2_db + }; int fi; for( fi = 0; fi < ARRAYLENGTH(mob_db_name); ++fi ) { @@ -4523,12 +4520,9 @@ void mob_readskilldb(void) { */ int mob_read_sqlskilldb(void) { 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 }; + map->mob_skill_db_db, + map->mob_skill_db2_db + }; int fi; if( battle_config.mob_skill_rate == 0 ) { diff --git a/src/plugins/db2sql.c b/src/plugins/db2sql.c index 62ed80255..1e27058c0 100644 --- a/src/plugins/db2sql.c +++ b/src/plugins/db2sql.c @@ -301,7 +301,7 @@ void do_db2sql(void) { return; } - tosql.db_name = map->item_db_re_db; + tosql.db_name = map->item_db_db; totable(); memset(&tosql.buf, 0, sizeof(tosql.buf) ); |