From 02970d7f1eb4e67ad850d140ff9acebc63d31036 Mon Sep 17 00:00:00 2001
From: Valaris <Valaris@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 10 Feb 2006 00:09:29 +0000
Subject: 	* Removed the conf sql code for now.  Maybe will continue
 later with that project. 	  Lowered the irc keepalive timer, and added
 some checks for use_irc that should have been there. 	  Added a return line
 \n to the beginning of the title screen. [Valaris]

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5241 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/map.c | 38 ++++----------------------------------
 1 file changed, 4 insertions(+), 34 deletions(-)

(limited to 'src/map/map.c')

diff --git a/src/map/map.c b/src/map/map.c
index 3b0c59e28..f30b70619 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -92,35 +92,6 @@ char item_db2_db[32] = "item_db2";
 char mob_db_db[32] = "mob_db";
 char mob_db2_db[32] = "mob_db2";
 
-// SQL for databases not supported yet. [Valaris]
-int db_use_newsqldbs = 0;
-
-char abra_sqldb[32]="abra_db";
-char attr_fix_sqldb[32]="attr_fix";
-char cast_sqldb[32]="cast_db";
-char castle_sqldb[32]="castle_db";
-char create_arrow_sqldb[32]="create_arrow_db";
-char exp_sqldb[32]="exp";
-char exp_guild_sqldb[32]="exp_guild";
-char item_bluebox_sqldb[32]="item_bluebox";
-char item_cardalbum_sqldb[32]="item_cardalbum";
-char item_giftbox_sqldb[32]="item_giftbox";
-char item_scroll_sqldb[32]="item_scroll";
-char item_violetbox_sqldb[32]="item_violetbox";
-char job_sqldb1[32]="job_db1";
-char mob_boss_sqldb[32]="mob_boss";
-char mob_branch_sqldb[32]="mob_branch";
-char mob_poring_sqldb[32]="mob_poring";
-char mob_skill_sqldb[32]="mob_skill_db";
-char pet_sqldb[32]="pet_db";
-char produce_sqldb[32]="produce_db";
-char refine_sqldb[32]="refine_db";
-char size_fix_sqldb[32]="size_fix";
-char skill_sqldb[32]="skill_db";
-char skill_require_sqldb[32]="skill_require_db";
-char skill_tree_sqldb[32]="skill_tree";
-// End [Valaris]
-
 char login_db[32] = "login";
 char login_db_level[32] = "level";
 char login_db_account_id[32] = "account_id";
@@ -3467,9 +3438,6 @@ int inter_config_read(char *cfgName)
 		} else if(strcmpi(w1,"use_sql_db")==0){
 			db_use_sqldbs = battle_config_switch(w2);
 			ShowStatus ("Using SQL dbs: %s\n",w2);
-		} else if(strcmpi(w1,"use_new_sql_db")==0){
-			db_use_newsqldbs = battle_config_switch(w2);
-			ShowStatus ("Using New SQL dbs: %s\n",w2);
 		//Login Server SQL DB
 		} else if(strcmpi(w1,"login_server_ip")==0){
 			strcpy(login_server_ip, w2);
@@ -3750,7 +3718,8 @@ void do_final(void) {
 	do_final_pet();
 	do_final_mob();
 	do_final_msg();
-	do_final_irc();
+	if(use_irc)
+		do_final_irc();
 
 	map_getallusers(NULL); //Clear the memory allocated for this array.
 	
@@ -3947,7 +3916,8 @@ int do_init(int argc, char *argv[]) {
 	add_timer_func_list(map_removemobs_timer, "map_removemobs_timer");
 	add_timer_interval(gettick()+1000, map_freeblock_timer, 0, 0, 60*1000);
 
-	do_init_irc();
+	if(use_irc)
+		do_init_irc();
 	do_init_atcommand();
 	do_init_battle();
 	do_init_chrif();
-- 
cgit v1.2.3-60-g2f50