- Fixed a typo bug in SC_STAR_COMFORT handling.

- Fixed a possible crash bug in SC_POISONREACT handling.
- Simplified the skill trigger code for ST_PRESERVE, SG_FUSION, SG_*_COMFORT
- Unified the status change variables into a single structure (sc_count, opt1, opt2, opt3, option, and the array of status change data) which should make it easier to handle sc related stuff.
- TK_DODGE now won't trigger if your opt1 is set ;)


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5154 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 7 insertions, 7 deletions

diff --git a/src/map/npc.c b/src/map/npc.c
index 86b4c823c..bcf66db6c 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -104,11 +104,11 @@ int npc_enable(const char *name,int flag)
 		clif_spawnnpc(nd);

 	}else if (flag&2){

 		nd->flag&=~1;

-		nd->option = 0x0000;

+		nd->sc.option = 0x0000;

 		clif_changeoption(&nd->bl);

 	}else if (flag&4){

 		nd->flag|=1;

-		nd->option = 0x0002;

+		nd->sc.option = 0x0002;

 		clif_changeoption(&nd->bl);

 	}else{		// –³Œø‰»

 		nd->flag|=1;

@@ -794,7 +794,7 @@ int npc_touch_areanpc(struct map_session_data *sd,int m,int x,int y)
 	switch(map[m].npc[i]->bl.subtype) {

 		case WARP:

 			// hidden chars cannot use warps -- is it the same for scripts too?

-			if (sd->status.option&6 ||

+			if (sd->sc.option&6 ||

 				(!battle_config.duel_allow_teleport && sd->duel_group)) // duel rstrct [LuzZza]

 				break;

 			skill_stop_dancing(&sd->bl);

@@ -1950,10 +1950,10 @@ static int npc_parse_script (char *w1,char *w2,char *w3,char *w4,char *first_lin
 	nd->u.scr.src_id = src_id;

 /* Cleaned up above with memset...

 	nd->chat_id = 0;

-	nd->option = 0;

-	nd->opt1 = 0;

-	nd->opt2 = 0;

-	nd->opt3 = 0;

+	nd->sc.option = 0;

+	nd->sc.opt1 = 0;

+	nd->sc.opt2 = 0;

+	nd->sc.opt3 = 0;

 */

 	nd->walktimer = -1;