diff options
| author | Haru <haru@dotalux.com> | 2015-01-22 12:04:07 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2015-01-22 12:05:10 +0100 |
| commit | 8f7889b79ce4b189390c33d23b338afb078bef38 (patch) | |
| tree | ecdf38968b8aa628aae6baa667c678079da50a87 /src/map/mob.c | |
| parent | e1b9abba3ae76aa7a6c310abdf485cd34ab4057d (diff) | |
| download | hercules-8f7889b79ce4b189390c33d23b338afb078bef38.tar.gz hercules-8f7889b79ce4b189390c33d23b338afb078bef38.tar.bz2 hercules-8f7889b79ce4b189390c33d23b338afb078bef38.tar.xz hercules-8f7889b79ce4b189390c33d23b338afb078bef38.zip | |
Removed name distinction between (sql) mob/item/mob_skill db and db_re variants
- Since there (currently and in future) is no difference between the
table structure for renewal and pre-renewal databases, it makes no
sense to have extra code that makes a distinction between their names.
A server will always use either one or the other, never both at the
same time.
- If you have a mob_db_re, mob_skill_db_re and/or item_db_re table,
please rename it to mob_db, mob_skill_db and/or item_db_re,
respectively.
- No upgrade script provided. I'd like to remind everyone that these
tables are optional (and deprecated), and they are only offered for
convenience for those who need them for web control panels and similar
software.
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/mob.c')
| -rw-r--r-- | src/map/mob.c | 18 |
1 files changed, 6 insertions, 12 deletions
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 ) { |