- 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, 8 insertions, 8 deletions

diff --git a/src/map/map.c b/src/map/map.c
index 00df83fc0..920909279 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1527,16 +1527,16 @@ int map_quit(struct map_session_data *sd) {
 		skill_stop_dancing(&sd->bl);// ダンス/演奏中?

 

 		//Status that are not saved...

-		if(sd->sc_count) {

-			if(sd->sc_data[SC_HIDING].timer!=-1)

+		if(sd->sc.count) {

+			if(sd->sc.data[SC_HIDING].timer!=-1)

 				status_change_end(&sd->bl,SC_HIDING,-1);

-			if(sd->sc_data[SC_CLOAKING].timer!=-1)

+			if(sd->sc.data[SC_CLOAKING].timer!=-1)

 				status_change_end(&sd->bl,SC_CLOAKING,-1);

-			if(sd->sc_data[SC_RUN].timer!=-1)

+			if(sd->sc.data[SC_RUN].timer!=-1)

 				status_change_end(&sd->bl,SC_RUN,-1);

-			if(sd->sc_data[SC_SPURT].timer!=-1)

+			if(sd->sc.data[SC_SPURT].timer!=-1)

 				status_change_end(&sd->bl,SC_SPURT,-1);

-			if(sd->sc_data && sd->sc_data[SC_BERSERK].timer!=-1)

+			if(sd->sc.data[SC_BERSERK].timer!=-1)

 				status_change_end(&sd->bl,SC_BERSERK,-1);

 		}

 		skill_clear_unitgroup(&sd->bl);	// スキルユニットグル?プの削除

@@ -1557,7 +1557,7 @@ int map_quit(struct map_session_data *sd) {
 			status_calc_pc(sd,4);

 	//	skill_clear_unitgroup(&sd->bl);	// [Sara-chan]

 

-		if (!(sd->status.option & OPTION_INVISIBLE))

+		if (!(sd->sc.option & OPTION_INVISIBLE))

 			clif_clearchar_area(&sd->bl,2);

 

 		chrif_save_scdata(sd); //Save status changes, then clear'em out from memory. [Skotlex]

@@ -1593,7 +1593,7 @@ int map_quit(struct map_session_data *sd) {
 	} else { //Try to free some data, without saving anything (this could be invoked on map server change. [Skotlex]

 		if (sd->bl.prev != NULL)

 		{	//Remove from map...

-			if (!(sd->status.option & OPTION_INVISIBLE))

+			if (!(sd->sc.option & OPTION_INVISIBLE))

 				clif_clearchar_area(&sd->bl,2);

 			map_delblock(&sd->bl);

 		}