From d36bb8c6615fe658b2ef5f860fae9c8b8f2a556c Mon Sep 17 00:00:00 2001 From: skotlex Date: Wed, 22 Mar 2006 14:08:03 +0000 Subject: - Some cleanups in irc.c - Changed ASC_BREAKER's cast to 700ms - Magic skills that ignore element now also don't take into account elemental cards. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5702 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.c | 6 ++++-- src/map/irc.c | 8 +++++++- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/map/battle.c b/src/map/battle.c index 64cd00fdb..6b48bd8a3 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2809,7 +2809,8 @@ struct Damage battle_calc_magic_attack( short cardfix=100; cardfix=cardfix*(100+sd->magic_addrace[t_race])/100; - cardfix=cardfix*(100+sd->magic_addele[t_ele])/100; + if (flag.elefix) + cardfix=cardfix*(100+sd->magic_addele[t_ele])/100; cardfix=cardfix*(100+sd->magic_addsize[t_size])/100; cardfix=cardfix*(100+sd->magic_addrace[is_boss(target)?10:11])/100; for(i=0;iadd_mdmg_count;i++) { @@ -2828,7 +2829,8 @@ struct Damage battle_calc_magic_attack( short s_class= status_get_class(src); short cardfix=100; - cardfix=cardfix*(100-tsd->subele[s_ele])/100; + if (flag.elefix) + cardfix=cardfix*(100-tsd->subele[s_ele])/100; cardfix=cardfix*(100-tsd->subsize[s_size])/100; cardfix=cardfix*(100-tsd->subrace2[s_race2])/100; cardfix=cardfix*(100-tsd->subrace[s_race])/100; diff --git a/src/map/irc.c b/src/map/irc.c index 276dcccb8..c61c5d890 100644 --- a/src/map/irc.c +++ b/src/map/irc.c @@ -135,6 +135,10 @@ int irc_parse(int fd) { if (session[fd]->eof){ do_close(fd); + if (irc_si) { + aFree(irc_si); + irc_si = NULL; + } add_timer(gettick() + 15000, irc_connect_timer, 0, 0); return 0; } @@ -143,8 +147,10 @@ int irc_parse(int fd) irc_si->fd = fd; irc_si->state = 0; session[fd]->session_data = irc_si; + } else if (!irc_si) { + irc_si = (struct IRC_Session_Info*)session[fd]->session_data; + irc_si->fd = fd; } - irc_si = (struct IRC_Session_Info*)session[fd]->session_data; if(RFIFOREST(fd) > 0){ char *incoming_string=aCalloc(RFIFOREST(fd),sizeof(char)); memcpy(incoming_string,RFIFOP(fd,0),RFIFOREST(fd)); -- cgit v1.2.3-70-g09d2