From 02970d7f1eb4e67ad850d140ff9acebc63d31036 Mon Sep 17 00:00:00 2001 From: Valaris 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 --- Changelog-Trunk.txt | 3 + src/common/core.c | 1 + src/map/irc.c | 4 +- src/map/map.c | 38 +---- src/map/map.h | 29 ---- src/map/skill.c | 408 ---------------------------------------------------- 6 files changed, 10 insertions(+), 473 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 93cb6ec9e..a237696e5 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,6 +5,9 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS 2006/02/09 + * 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] * Added function mob_respawn which makes a mob respawn on spot 3 seconds after defeat if SC_KAIZEL is active. [Skotlex] * Modified NPC_REBIRTH to use Kaizel level 1. [Skotlex] diff --git a/src/common/core.c b/src/common/core.c index 857f21eb6..fe16d26a9 100644 --- a/src/common/core.c +++ b/src/common/core.c @@ -159,6 +159,7 @@ static void display_title(void) { //The clearscreeen is usually more of an annoyance than anything else... [Skotlex] // ClearScreen(); // clear screen and go up/left (0, 0 position in text) + ShowMessage("\n"); ShowMessage(""CL_WTBL" (=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=)"CL_CLL""CL_NORMAL"\n"); // white writing (37) on blue background (44), \033[K clean until end of file ShowMessage(""CL_XXBL" ("CL_BT_YELLOW" (c)2005 eAthena Development Team presents "CL_XXBL")"CL_CLL""CL_NORMAL"\n"); // yellow writing (33) ShowMessage(""CL_XXBL" ("CL_BOLD" ______ __ __ "CL_XXBL")"CL_CLL""CL_NORMAL"\n"); // 1: bold char, 0: normal char diff --git a/src/map/irc.c b/src/map/irc.c index 5bc0dd633..5772655be 100644 --- a/src/map/irc.c +++ b/src/map/irc.c @@ -149,7 +149,7 @@ int irc_keepalive_timer(int tid, unsigned int tick, int id, int data) sprintf(send_string,"PRIVMSG %s : ", irc_nick); irc_send(send_string); - add_timer(gettick() + 45000, irc_keepalive_timer, 0, 0); + add_timer(gettick() + 30000, irc_keepalive_timer, 0, 0); return 0; } @@ -270,6 +270,6 @@ void do_init_irc(void) add_timer_func_list(irc_connect_timer, "irc_connect_timer"); add_timer_func_list(irc_keepalive_timer, "irc_keepalive_timer"); - add_timer(gettick() + 45000, irc_keepalive_timer, 0, 0); + add_timer(gettick() + 30000, irc_keepalive_timer, 0, 0); } 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(); diff --git a/src/map/map.h b/src/map/map.h index 48c2b4093..f8bfa82cc 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -1365,35 +1365,6 @@ extern char mob_db_db[32]; extern char mob_db2_db[32]; extern char login_db[32]; -// SQL for databases not supported yet. [Valaris] -extern int db_use_newsqldbs; - -extern char abra_sqldb[32]; -extern char attr_fix_sqldb[32]; -extern char cast_sqldb[32]; -extern char castle_sqldb[32]; -extern char create_arrow_sqldb[32]; -extern char exp_sqldb[32]; -extern char exp_guild_sqldb[32]; -extern char item_bluebox_sqldb[32]; -extern char item_cardalbum_sqldb[32]; -extern char item_giftbox_sqldb[32]; -extern char item_scroll_sqldb[32]; -extern char item_violetbox_sqldb[32]; -extern char job_sqldb1[32]; -extern char mob_boss_sqldb[32]; -extern char mob_branch_sqldb[32]; -extern char mob_poring_sqldb[32]; -extern char mob_skill_sqldb[32]; -extern char pet_sqldb[32]; -extern char produce_sqldb[32]; -extern char refine_sqldb[32]; -extern char size_fix_sqldb[32]; -extern char skill_sqldb[32]; -extern char skill_require_sqldb[32]; -extern char skill_tree_sqldb[32]; -// End [Valaris] - extern char login_db_level[32]; extern char login_db_account_id[32]; diff --git a/src/map/skill.c b/src/map/skill.c index 9e45d6304..0c9376acf 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -11719,408 +11719,6 @@ int skill_readdb(void) return 0; } -// SQL Skill database reading [Valaris] -#ifndef TXT_ONLY -int skill_read_sqldb(void) -{ - const char unknown_str[NAME_LENGTH] ="unknown"; - int i,j,k,l,m; - FILE *fp; - char line[1024],path[1024],*p; - char *filename[]={"produce_db.txt","produce_db2.txt"}; - long unsigned int ln = 0; - - /* スキルデ?タベ?ス */ - memset(skill_db,0,sizeof(skill_db)); - - //For easier handling of converting. [Skotlex] -#define TO_INT(a) (sql_row[a]==NULL?0:atoi(sql_row[a])) -#define TO_STR(a) (sql_row[a]==NULL?unknown_str:sql_row[a]) - sprintf (tmp_sql, "SELECT * FROM `%s`", skill_sqldb); - if (mysql_query(&mmysql_handle, tmp_sql)) { - ShowSQL("DB error (%s) - %s\n", skill_sqldb, mysql_error(&mmysql_handle)); - ShowDebug("at %s:%d - %s\n", __FILE__,__LINE__,tmp_sql); - return 1; - } - sql_res = mysql_store_result(&mmysql_handle); - if (sql_res) { - while((sql_row = mysql_fetch_row(sql_res))){ - i=TO_INT(0); - if (i>=10000 && i<10015) // for guild skills [Celest] - i -= 9500; - else if(i<=0 || i>MAX_SKILL_DB) - continue; - - ln++; - - skill_split_atoi(sql_row[1],skill_db[i].range); - skill_db[i].hit=TO_INT(2); - skill_db[i].inf=TO_INT(3); - skill_db[i].pl=TO_INT(4); - skill_db[i].nk=TO_INT(5); - skill_db[i].max=TO_INT(6); - skill_split_atoi(sql_row[7],skill_db[i].num); - - if(strcmpi(TO_STR(8),"yes") == 0) - skill_db[i].castcancel=1; - else - skill_db[i].castcancel=0; - skill_db[i].cast_def_rate=TO_INT(9); - skill_db[i].inf2=TO_INT(10); - skill_db[i].maxcount=TO_INT(11); - if(strcmpi(TO_STR(12),"weapon") == 0) - skill_db[i].skill_type=BF_WEAPON; - else if(strcmpi(TO_STR(12),"magic") == 0) - skill_db[i].skill_type=BF_MAGIC; - else if(strcmpi(TO_STR(12),"misc") == 0) - skill_db[i].skill_type=BF_MISC; - else - skill_db[i].skill_type=0; - skill_split_atoi(sql_row[13],skill_db[i].blewcount); - - for (j = 0; skill_names[j].id != 0; j++) - if (skill_names[j].id == i) { - skill_db[i].name = skill_names[j].name; - skill_db[i].desc = skill_names[j].desc; - break; - } - } - mysql_free_result(sql_res); - ShowStatus("Done reading '"CL_WHITE"%lu"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", ln, skill_sqldb); - ln=0; - } - - sprintf (tmp_sql, "SELECT * FROM `%s`", skill_require_sqldb); - if (mysql_query(&mmysql_handle, tmp_sql)) { - ShowSQL("DB error (%s) - %s\n", skill_require_sqldb, mysql_error(&mmysql_handle)); - ShowDebug("at %s:%d - %s\n", __FILE__,__LINE__,tmp_sql); - return 1; - } - sql_res = mysql_store_result(&mmysql_handle); - if (sql_res) { - while((sql_row = mysql_fetch_row(sql_res))){ - i=TO_INT(0); - if (i>=10000 && i<10015) // for guild skills [Celest] - i -= 9500; - else if(i<=0 || i>MAX_SKILL_DB) - continue; - - ln++; - - skill_split_atoi(sql_row[1],skill_db[i].hp); - skill_split_atoi(sql_row[2],skill_db[i].mhp); - skill_split_atoi(sql_row[3],skill_db[i].sp); - skill_split_atoi(sql_row[4],skill_db[i].hp_rate); - skill_split_atoi(sql_row[5],skill_db[i].sp_rate); - skill_split_atoi(sql_row[6],skill_db[i].zeny); - - p = sql_row[7]; - for(j=0;j<32;j++){ - l = atoi(p); - if (l==99) { - skill_db[i].weapon = 0xffffffff; - break; - } - else - skill_db[i].weapon |= 1<=10000 && i<10015) // for guild skills [Celest] - i -= 9500; - else if(i<=0 || i>MAX_SKILL_DB) - continue; - - ln++; - - skill_split_atoi(sql_row[1],skill_db[i].cast); - skill_split_atoi(sql_row[2],skill_db[i].delay); - skill_split_atoi(sql_row[3],skill_db[i].upkeep_time); - skill_split_atoi(sql_row[4],skill_db[i].upkeep_time2); - } - mysql_free_result(sql_res); - ShowStatus("Done reading '"CL_WHITE"%lu"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", ln, cast_sqldb); - ln=0; - } - - /* スキルユニットデ?[タベ?[ス */ - - sprintf(path, "%s/skill_unit_db.txt", db_path); - fp=fopen(path,"r"); - if (fp==NULL) { - ShowError("can't read %s\n", path); - return 1; - } - k = 0; - while (fgets(line,1020,fp)) { - char *split[50]; - if (line[0]=='/' && line[1]=='/') - continue; - j = skill_split_str(line,split,8); - if (split[7]==NULL || j<8) - continue; - - i=atoi(split[0]); - if (i>=10000 && i<10015) // for guild skills [Celest] - i -= 9500; - else if(i<=0 || i>MAX_SKILL_DB) - continue; - skill_db[i].unit_id[0] = strtol(split[1],NULL,16); - skill_db[i].unit_id[1] = strtol(split[2],NULL,16); - skill_split_atoi(split[3],skill_db[i].unit_layout_type); - skill_db[i].unit_range = atoi(split[4]); - skill_db[i].unit_interval = atoi(split[5]); - - if( strcmpi(split[6],"noenemy")==0 ) skill_db[i].unit_target=BCT_NOENEMY; - else if( strcmpi(split[6],"friend")==0 ) skill_db[i].unit_target=BCT_NOENEMY; - else if( strcmpi(split[6],"party")==0 ) skill_db[i].unit_target=BCT_PARTY; - else if( strcmpi(split[6],"ally")==0 ) skill_db[i].unit_target=BCT_PARTY|BCT_GUILD; - else if( strcmpi(split[6],"all")==0 ) skill_db[i].unit_target=BCT_ALL; - else if( strcmpi(split[6],"enemy")==0 ) skill_db[i].unit_target=BCT_ENEMY; - else if( strcmpi(split[6],"self")==0 ) skill_db[i].unit_target=BCT_SELF; - else if( strcmpi(split[6],"noone")==0 ) skill_db[i].unit_target=BCT_NOONE; - else skill_db[i].unit_target = strtol(split[6],NULL,16); - - skill_db[i].unit_flag = strtol(split[7],NULL,16); - if (skill_db[i].unit_flag&UF_DEFNOTENEMY && battle_config.defnotenemy) - skill_db[i].unit_target=BCT_NOENEMY; - - //By default, target just characters. - skill_db[i].unit_target |= BL_CHAR; - if (skill_db[i].unit_flag&UF_NOPC) - skill_db[i].unit_target &= ~BL_PC; - if (skill_db[i].unit_flag&UF_NOMOB) - skill_db[i].unit_target &= ~BL_MOB; - if (skill_db[i].unit_flag&UF_SKILL) - skill_db[i].unit_target |= BL_SKILL; - - k++; - } - fclose(fp); - ShowStatus("Done reading '"CL_WHITE"%s"CL_RESET"'.\n",path); - skill_init_unit_layout(); - - /* ?ｻ造系スキルデ?タベ?ス */ - memset(skill_produce_db,0,sizeof(skill_produce_db)); - for(m=0;m<2;m++){ - sprintf(path, "%s/%s", db_path, filename[m]); - fp=fopen(path,"r"); - if(fp==NULL){ - if(m>0) - continue; - ShowError("can't read %s\n",path); - return 1; - } - k=0; - while(fgets(line,1020,fp)){ - char *split[6 + MAX_PRODUCE_RESOURCE * 2]; - int x,y; - if(line[0]=='/' && line[1]=='/') - continue; - memset(split,0,sizeof(split)); - j = skill_split_str(line,split,(3 + MAX_PRODUCE_RESOURCE * 2)); - if(split[0]==0) //fixed by Lupus - continue; - i=atoi(split[0]); - if(i<=0) continue; - - skill_produce_db[k].nameid=i; - skill_produce_db[k].itemlv=atoi(split[1]); - skill_produce_db[k].req_skill=atoi(split[2]); - - for(x=3,y=0; split[x] && split[x+1] && y= MAX_SKILL_PRODUCE_DB) - break; - } - fclose(fp); - ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",k,path); - } - - memset(skill_arrow_db,0,sizeof(skill_arrow_db)); - - sprintf(path, "%s/create_arrow_db.txt", db_path); - fp=fopen(path,"r"); - if(fp==NULL){ - ShowError("can't read %s\n", path); - return 1; - } - k=0; - while(fgets(line,1020,fp)){ - char *split[16]; - int x,y; - if(line[0]=='/' && line[1]=='/') - continue; - memset(split,0,sizeof(split)); - j = skill_split_str(line,split,13); - if(split[0]==0) //fixed by Lupus - continue; - i=atoi(split[0]); - if(i<=0) - continue; - - skill_arrow_db[k].nameid=i; - - for(x=1,y=0;split[x] && split[x+1] && y<5;x+=2,y++){ - skill_arrow_db[k].cre_id[y]=atoi(split[x]); - skill_arrow_db[k].cre_amount[y]=atoi(split[x+1]); - } - k++; - if(k >= MAX_SKILL_ARROW_DB) - break; - } - fclose(fp); - ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",k,path); - - memset(skill_abra_db,0,sizeof(skill_abra_db)); - sprintf(path, "%s/abra_db.txt", db_path); - fp=fopen(path,"r"); - if(fp==NULL){ - ShowError("can't read %s\n", path); - return 1; - } - k=0; - while(fgets(line,1020,fp)){ - char *split[16]; - if(line[0]=='/' && line[1]=='/') - continue; - memset(split,0,sizeof(split)); - j = skill_split_str(line,split,13); - if(split[0]==0) //fixed by Lupus - continue; - i=atoi(split[0]); - if(i<=0) - continue; - - skill_abra_db[i].req_lv=atoi(split[2]); - skill_abra_db[i].per=atoi(split[3]); - - k++; - if(k >= MAX_SKILL_ABRA_DB) - break; - } - fclose(fp); - ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",k,path); - - sprintf(path, "%s/skill_castnodex_db.txt", db_path); - fp=fopen(path,"r"); - if(fp==NULL){ - ShowError("can't read %s\n", path); - return 1; - } - while(fgets(line,1020,fp)){ - char *split[50]; - if(line[0]=='/' && line[1]=='/') - continue; - memset(split,0,sizeof(split)); - j = skill_split_str(line,split,4); - if(split[0]==0) //fixed by Lupus - continue; - i=atoi(split[0]); - if (i>=10000 && i<10015) // for guild skills [Celest] - i -= 9500; - else if(i<=0 || i>MAX_SKILL_DB) - continue; - - skill_split_atoi(split[1],skill_db[i].castnodex); - if (!split[2]) - continue; - skill_split_atoi(split[2],skill_db[i].delaynodex); - if(!split[3]) - continue; - skill_split_atoi(split[3],skill_db[i].delaynowalk); - } - fclose(fp); - ShowStatus("Done reading '"CL_WHITE"%s"CL_RESET"'.\n",path); - - sprintf(path, "%s/skill_nocast_db.txt", db_path); - fp=fopen(path,"r"); - if(fp==NULL){ - ShowError("can't read %s\n", path); - return 1; - } - k=0; - while(fgets(line,1020,fp)){ - char *split[16]; - if(line[0]=='/' && line[1]=='/') - continue; - memset(split,0,sizeof(split)); - j = skill_split_str(line,split,2); - if(split[0]==0) //fixed by Lupus - continue; - i=atoi(split[0]); - if (i>=10000 && i<10015) // for guild skills [Celest] - i -= 9500; - else if(i<=0 || i>MAX_SKILL_DB) - continue; - skill_db[i].nocast=atoi(split[1]); - k++; - } - fclose(fp); - ShowStatus("Done reading '"CL_WHITE"%s"CL_RESET"'.\n",path); - - return 0; -} -#endif - /*=============================================== * For reading leveluseskillspamount.txt [Celest] *----------------------------------------------- @@ -12179,12 +11777,6 @@ void skill_reload(void) */ int do_init_skill(void) { - -#ifndef TXT_ONLY - if(db_use_newsqldbs) - skill_read_sqldb(); - else -#endif /* TXT_ONLY */ skill_readdb(); if (battle_config.skill_sp_override_grffile) -- cgit v1.2.3-70-g09d2