diff options
| -rw-r--r-- | sql-files/main.sql | 20 | ||||
| -rw-r--r-- | sql-files/upgrades/2015-07-08--13-08.sql | 6 | ||||
| -rw-r--r-- | sql-files/upgrades/index.txt | 3 | ||||
| -rw-r--r-- | src/char/char.c | 3 | ||||
| -rw-r--r-- | src/char/char.h | 1 | ||||
| -rw-r--r-- | src/map/map.c | 3 | ||||
| -rw-r--r-- | src/map/map.h | 1 |
7 files changed, 8 insertions, 29 deletions
diff --git a/sql-files/main.sql b/sql-files/main.sql index 646805d1b..c95610016 100644 --- a/sql-files/main.sql +++ b/sql-files/main.sql @@ -495,16 +495,6 @@ CREATE TABLE IF NOT EXISTS `interlog` ( ) ENGINE=MyISAM; -- --- Table structure for table `interreg` --- - -CREATE TABLE IF NOT EXISTS `interreg` ( - `varname` VARCHAR(11) NOT NULL, - `value` VARCHAR(20) NOT NULL, - PRIMARY KEY (`varname`) -) ENGINE=InnoDB; - --- -- Table structure for table `inventory` -- @@ -811,16 +801,6 @@ INSERT INTO `sql_updates` (`timestamp`) VALUES (1414975503); -- 2014-11-03--00-4 INSERT INTO `sql_updates` (`timestamp`) VALUES (1435860840); -- 2015-07-02--18-14.sql -- --- Table structure for table `sstatus` --- - -CREATE TABLE IF NOT EXISTS `sstatus` ( - `index` TINYINT(4) UNSIGNED NOT NULL DEFAULT '0', - `name` VARCHAR(255) NOT NULL DEFAULT '', - `user` INT(11) UNSIGNED NOT NULL DEFAULT '0' -) ENGINE=MyISAM; - --- -- Table structure for table `storage` -- diff --git a/sql-files/upgrades/2015-07-08--13-08.sql b/sql-files/upgrades/2015-07-08--13-08.sql new file mode 100644 index 000000000..f9cbf1a42 --- /dev/null +++ b/sql-files/upgrades/2015-07-08--13-08.sql @@ -0,0 +1,6 @@ +#1436360978 + +DROP TABLE IF EXISTS interreg; +DROP TABLE IF EXISTS sstatus; + +INSERT INTO `sql_updates` (`timestamp`) VALUES (1435860840); diff --git a/sql-files/upgrades/index.txt b/sql-files/upgrades/index.txt index 0e6917f16..94d87d191 100644 --- a/sql-files/upgrades/index.txt +++ b/sql-files/upgrades/index.txt @@ -25,4 +25,5 @@ 2014-05-17--00-06.sql 2014-09-01--16-53.sql 2014-11-03--00-45.sql -2015-07-02--18-14.sql
\ No newline at end of file +2015-07-02--18-14.sql +2015-07-08--13-08.sql diff --git a/src/char/char.c b/src/char/char.c index 7b1078e37..b6ce70985 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -80,7 +80,6 @@ char mercenary_db[256] = "mercenary"; char mercenary_owner_db[256] = "mercenary_owner"; char ragsrvinfo_db[256] = "ragsrvinfo"; char elemental_db[256] = "elemental"; -char interreg_db[32] = "interreg"; char account_data_db[256] = "account_data"; char acc_reg_num_db[32] = "acc_reg_num_db"; char acc_reg_str_db[32] = "acc_reg_str_db"; @@ -5582,8 +5581,6 @@ void char_sql_config_read(const char* cfgName) safestrncpy(ragsrvinfo_db,w2,sizeof(ragsrvinfo_db)); else if(!strcmpi(w1,"elemental_db")) safestrncpy(elemental_db,w2,sizeof(elemental_db)); - else if(!strcmpi(w1,"interreg_db")) - safestrncpy(interreg_db,w2,sizeof(interreg_db)); else if(!strcmpi(w1,"account_data_db")) safestrncpy(account_data_db,w2,sizeof(account_data_db)); else if(!strcmpi(w1,"char_reg_num_db")) diff --git a/src/char/char.h b/src/char/char.h index 5f2f8571a..b3aa7bc34 100644 --- a/src/char/char.h +++ b/src/char/char.h @@ -99,7 +99,6 @@ extern char mercenary_db[256]; extern char mercenary_owner_db[256]; extern char ragsrvinfo_db[256]; extern char elemental_db[256]; -extern char interreg_db[32]; extern char acc_reg_num_db[32]; extern char acc_reg_str_db[32]; extern char char_reg_str_db[32]; diff --git a/src/map/map.c b/src/map/map.c index 2ad13bea3..abbc5c954 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -3730,8 +3730,6 @@ int inter_config_read(char *cfgName) { safestrncpy(map->mob_skill_db_db, w2, sizeof(map->mob_skill_db_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) - safestrncpy(map->interreg_db, w2, sizeof(map->interreg_db)); /* map sql stuff */ else if(strcmpi(w1,"map_server_ip")==0) safestrncpy(map->server_ip, w2, sizeof(map->server_ip)); @@ -6113,7 +6111,6 @@ void map_defaults(void) { sprintf(map->mob_db2_db, "mob_db2"); sprintf(map->mob_skill_db_db, "mob_skill_db"); sprintf(map->mob_skill_db2_db, "mob_skill_db2"); - sprintf(map->interreg_db, "interreg"); map->INTER_CONF_NAME="conf/inter-server.conf"; map->LOG_CONF_NAME="conf/logs.conf"; diff --git a/src/map/map.h b/src/map/map.h index 8d879cd56..826548f49 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -861,7 +861,6 @@ struct map_interface { char mob_db2_db[32]; char mob_skill_db_db[32]; char mob_skill_db2_db[32]; - char interreg_db[32]; char autotrade_merchants_db[32]; char autotrade_data_db[32]; char npc_market_data_db[32]; |