diff options
| -rw-r--r-- | conf/inter-server.conf | 2 | ||||
| -rw-r--r-- | sql-files/mob_db_re.sql | 6 | ||||
| -rw-r--r-- | sql-files/mob_skill_db_re.sql | 6 | ||||
| -rw-r--r-- | src/map/map.c | 14 | ||||
| -rw-r--r-- | src/map/map.h | 2 | ||||
| -rw-r--r-- | src/map/mob.c | 16 |
6 files changed, 34 insertions, 12 deletions
diff --git a/conf/inter-server.conf b/conf/inter-server.conf index 184285cfd..d6b833289 100644 --- a/conf/inter-server.conf +++ b/conf/inter-server.conf @@ -121,8 +121,10 @@ item_db_db: item_db item_db_re_db: item_db_re item_db2_db: item_db2 mob_db_db: mob_db +mob_db_re_db: mob_db_re mob_db2_db: mob_db2 mob_skill_db_db: mob_skill_db +mob_skill_db_re_db: mob_skill_db_re mob_skill_db2_db: mob_skill_db2 mapreg_db: mapreg autotrade_merchants_db: autotrade_merchants diff --git a/sql-files/mob_db_re.sql b/sql-files/mob_db_re.sql index b4305de08..66f842a08 100644 --- a/sql-files/mob_db_re.sql +++ b/sql-files/mob_db_re.sql @@ -1,9 +1,9 @@ -- --- Table structure for table `mob_db` +-- Table structure for table `mob_db_re` -- -DROP TABLE IF EXISTS `mob_db`; -CREATE TABLE `mob_db` ( +DROP TABLE IF EXISTS `mob_db_re`; +CREATE TABLE `mob_db_re` ( `ID` MEDIUMINT(9) UNSIGNED NOT NULL DEFAULT '0', `Sprite` TEXT NOT NULL, `kName` TEXT NOT NULL, diff --git a/sql-files/mob_skill_db_re.sql b/sql-files/mob_skill_db_re.sql index e51925f80..8427ff2bd 100644 --- a/sql-files/mob_skill_db_re.sql +++ b/sql-files/mob_skill_db_re.sql @@ -1,9 +1,9 @@ -- --- Table structure for table `mob_skill_db` +-- Table structure for table `mob_skill_db_re` -- -DROP TABLE IF EXISTS `mob_skill_db`; -CREATE TABLE `mob_skill_db` ( +DROP TABLE IF EXISTS `mob_skill_db_re`; +CREATE TABLE `mob_skill_db_re` ( `MOB_ID` SMALLINT(6) NOT NULL, `INFO` TEXT NOT NULL, `STATE` TEXT NOT NULL, 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 ) { |