From 6460ab9b943f664e4353b375174a14e682e2d2fd Mon Sep 17 00:00:00 2001 From: skotlex Date: Tue, 21 Mar 2006 14:06:00 +0000 Subject: - Fixed the inf2 for BA_DISSONANCE - Fixed SC_SWOO's opt3 value. - Fixed allowing multiple recast of Dissonance/Ugly-Dance - Fixed those annoying irc.c compile warnings. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5693 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/irc.c | 6 +++--- src/map/status.c | 13 ++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/map/irc.c b/src/map/irc.c index b3cd74468..276dcccb8 100644 --- a/src/map/irc.c +++ b/src/map/irc.c @@ -197,7 +197,7 @@ void irc_parse_sub(int fd, char *incoming_string) char *source_nick=NULL; char *source_ident=NULL; char *source_host=NULL; - char *state_mgr=NULL; +// char *state_mgr=NULL; memset(source,'\0',256); memset(command,'\0',256); @@ -208,7 +208,7 @@ void irc_parse_sub(int fd, char *incoming_string) sscanf(incoming_string, ":%255s %255s %255s :%4095[^\n]", source, command, target, message); if (source != NULL) { if (strstr(source,"!") != NULL) { - sscanf(source,"%s!%s@$s",source_nick, source_ident, source_host); + sscanf(source,"%s!%s@%s",source_nick, source_ident, source_host); //source_nick = strtok_r(source,"!",&state_mgr); //source_ident = strtok_r(NULL,"@",&state_mgr); //source_host = strtok_r(NULL,"%%",&state_mgr); @@ -253,7 +253,7 @@ int send_to_parser(int fd, char *input,char key[2]) char format[4]; char *temp_string=NULL; char *next_string=NULL; - char *state_mgr=NULL; +// char *state_mgr=NULL; int total_loops=0; //temp_string = strtok_r(input,key,&state_mgr); diff --git a/src/map/status.c b/src/map/status.c index 82a724b3b..d576f29a2 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -343,7 +343,7 @@ int status_getrefinebonus(int lv,int type) * flag: * 0 - Trying to use skill on target. * 1 - Cast bar is done. - * 2- Skill already pulled off, check is due to ground-based skills or splash-damage ones. + * 2 - Skill already pulled off, check is due to ground-based skills or splash-damage ones. * src MAY be null to indicate we shouldn't check it, this is a ground-based skill attack. * target MAY Be null, in which case the checks are only to see * whether the source can cast or not the skill on the ground. @@ -439,11 +439,10 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int ) return 0; - if (sc->data[SC_DANCING].timer != -1) + if (flag!=2 && sc->data[SC_DANCING].timer != -1) { if (skill_num != BD_ADAPTATION && skill_num != CG_LONGINGFREEDOM - && skill_num != BA_MUSICALSTRIKE && skill_num != DC_THROWARROW - && skill_num != BA_DISSONANCE && skill_num != DC_UGLYDANCE) //[blackhole89] - these hit even (only, in fact) if you are dancing too + && skill_num != BA_MUSICALSTRIKE && skill_num != DC_THROWARROW) return 0; if (sc->data[SC_DANCING].val1 == CG_HERMODE && skill_num == BD_ADAPTATION) return 0; //Can't amp out of Wand of Hermode :/ [Skotlex] @@ -4549,6 +4548,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val break; case SC_MAXOVERTHRUST: case SC_OVERTHRUST: /* オ?バ?スラスト */ + case SC_SWOO: //Why does it shares the same opt as Overthrust? Perhaps we'll never know... sc->opt3 |= 2; opt_flag = 0; break; @@ -4592,9 +4592,6 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val sc->opt3 |= 4096; opt_flag = 0; break; -// case SC_SWOO: // [marquis007] -// sc->opt3 |= 8192; //We haven't figured out this value yet... -// break; //OPTION case SC_HIDING: @@ -5119,6 +5116,8 @@ int status_change_end( struct block_list* bl , int type,int tid ) sc->opt3 &= ~1; break; case SC_OVERTHRUST: /* オ?バ?スラスト */ + case SC_MAXOVERTHRUST: + case SC_SWOO: sc->opt3 &= ~2; break; case SC_ENERGYCOAT: /* エナジ?コ?ト */ -- cgit v1.2.3-70-g09d2