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

diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 36ca4cfc3..445c65a48 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -748,7 +748,7 @@ is_atcommand(const int fd, struct map_session_data* sd, const char* message, int
 	nullpo_retr(AtCommand_None, sd);

 

 	if (!battle_config.allow_atcommand_when_mute &&

-		sd->sc_count && sd->sc_data[SC_NOCHAT].timer != -1) {

+		sd->sc.count && sd->sc.data[SC_NOCHAT].timer != -1) {

 		return AtCommand_Unknown;

 	}

 

@@ -1407,7 +1407,7 @@ int atcommand_who3(
 	for (i = 0; i < users; i++) {

 		if ((pl_sd = pl_allsd[i])) {

 			pl_GM_level = pc_isGM(pl_sd);

-			if (!((battle_config.hide_GM_session || (pl_sd->status.option & OPTION_INVISIBLE)) && (pl_GM_level > GM_level))) { // you can look only lower or same level

+			if (!((battle_config.hide_GM_session || (pl_sd->sc.option & OPTION_INVISIBLE)) && (pl_GM_level > GM_level))) { // you can look only lower or same level

 				memcpy(player_name, pl_sd->status.name, NAME_LENGTH);

 				for (j = 0; player_name[j]; j++)

 					player_name[j] = tolower(player_name[j]);

@@ -1482,7 +1482,7 @@ int atcommand_who2(
 	for (i = 0; i < users; i++) {

 		if ((pl_sd = pl_allsd[i])) {

 			pl_GM_level = pc_isGM(pl_sd);

-			if (!((battle_config.hide_GM_session || (pl_sd->status.option & OPTION_INVISIBLE)) && (pl_GM_level > GM_level))) { // you can look only lower or same level

+			if (!((battle_config.hide_GM_session || (pl_sd->sc.option & OPTION_INVISIBLE)) && (pl_GM_level > GM_level))) { // you can look only lower or same level

 				memcpy(player_name, pl_sd->status.name, NAME_LENGTH);

 				for (j = 0; player_name[j]; j++)

 					player_name[j] = tolower(player_name[j]);

@@ -1555,7 +1555,7 @@ int atcommand_who(
 	for (i = 0; i < users; i++) {

 		if ((pl_sd = pl_allsd[i])) {

 			pl_GM_level = pc_isGM(pl_sd);

-			if (!((battle_config.hide_GM_session || (pl_sd->status.option & OPTION_INVISIBLE)) && (pl_GM_level > GM_level))) { // you can look only lower or same level

+			if (!((battle_config.hide_GM_session || (pl_sd->sc.option & OPTION_INVISIBLE)) && (pl_GM_level > GM_level))) { // you can look only lower or same level

 				memcpy(player_name, pl_sd->status.name, NAME_LENGTH);

 				for (j = 0; player_name[j]; j++)

 					player_name[j] = tolower(player_name[j]);

@@ -1635,7 +1635,7 @@ int atcommand_whomap3(
 	for (i = 0; i < users; i++) {

 		if ((pl_sd = pl_allsd[i])) {

 			pl_GM_level = pc_isGM(pl_sd);

-			if (!((battle_config.hide_GM_session || (pl_sd->status.option & OPTION_INVISIBLE)) && (pl_GM_level > GM_level))) { // you can look only lower or same level

+			if (!((battle_config.hide_GM_session || (pl_sd->sc.option & OPTION_INVISIBLE)) && (pl_GM_level > GM_level))) { // you can look only lower or same level

 				if (pl_sd->bl.m == map_id) {

 					if (pl_GM_level > 0)

 						sprintf(atcmd_output, "Name: %s (GM:%d) | Location: %s %d %d", pl_sd->status.name, pl_GM_level, mapindex_id2name(pl_sd->mapindex), pl_sd->bl.x, pl_sd->bl.y);

@@ -1695,7 +1695,7 @@ int atcommand_whomap2(
 	for (i = 0; i < users; i++) {

 		if ((pl_sd = pl_allsd[i])) {

 			pl_GM_level = pc_isGM(pl_sd);

-			if (!((battle_config.hide_GM_session || (pl_sd->status.option & OPTION_INVISIBLE)) && (pl_GM_level > GM_level))) { // you can look only lower or same level

+			if (!((battle_config.hide_GM_session || (pl_sd->sc.option & OPTION_INVISIBLE)) && (pl_GM_level > GM_level))) { // you can look only lower or same level

 				if (pl_sd->bl.m == map_id) {

 					if (pl_GM_level > 0)

 						sprintf(atcmd_output, "Name: %s (GM:%d) | BLvl: %d | Job: %s (Lvl: %d)", pl_sd->status.name, pl_GM_level, pl_sd->status.base_level, job_name(pl_sd->status.class_), pl_sd->status.job_level);

@@ -1762,7 +1762,7 @@ int atcommand_whomap(
 	for (i = 0; i < users; i++) {

 		if ((pl_sd = pl_allsd[i])) {

 			pl_GM_level = pc_isGM(pl_sd);

-			if (!((battle_config.hide_GM_session || (pl_sd->status.option & OPTION_INVISIBLE)) && (pl_GM_level > GM_level))) { // you can look only lower or same level

+			if (!((battle_config.hide_GM_session || (pl_sd->sc.option & OPTION_INVISIBLE)) && (pl_GM_level > GM_level))) { // you can look only lower or same level

 				if (pl_sd->bl.m == map_id) {

 					g = guild_search(pl_sd->status.guild_id);

 					if (g == NULL)

@@ -1835,7 +1835,7 @@ int atcommand_whogm(
 		if ((pl_sd = pl_allsd[i])) {

 			pl_GM_level = pc_isGM(pl_sd);

 			if (pl_GM_level > 0) {

-				if (!((battle_config.hide_GM_session || (pl_sd->status.option & OPTION_INVISIBLE)) && (pl_GM_level > GM_level))) { // you can look only lower or same level

+				if (!((battle_config.hide_GM_session || (pl_sd->sc.option & OPTION_INVISIBLE)) && (pl_GM_level > GM_level))) { // you can look only lower or same level

 					memcpy(player_name, pl_sd->status.name, NAME_LENGTH);

 					for (j = 0; player_name[j]; j++)

 						player_name[j] = tolower(player_name[j]);

@@ -2134,9 +2134,9 @@ int atcommand_option(
 		return -1;

 	}

 

-	sd->opt1 = param1;

-	sd->opt2 = param2;

-	if (!(sd->status.option & CART_MASK) && param3 & CART_MASK) {

+	sd->sc.opt1 = param1;

+	sd->sc.opt2 = param2;

+	if (!(sd->sc.option & CART_MASK) && param3 & CART_MASK) {

 		if (sd->status.class_ == JOB_BABY_MERCHANT)

 			clif_cart_itemlist(sd);

 		clif_cart_equiplist(sd);

@@ -2158,11 +2158,11 @@ int atcommand_hide(
 	const char* command, const char* message)

 {

 	nullpo_retr(-1, sd);

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

-		sd->status.option &= ~OPTION_INVISIBLE;

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

+		sd->sc.option &= ~OPTION_INVISIBLE;

 		clif_displaymessage(fd, msg_table[10]); // Invisible: Off

 	} else {

-		sd->status.option |= OPTION_INVISIBLE;

+		sd->sc.option |= OPTION_INVISIBLE;

 		clif_displaymessage(fd, msg_table[11]); // Invisible: On

 	}

 	clif_changeoption(&sd->bl);

@@ -5753,14 +5753,14 @@ int atcommand_mount_peco(
 

 	if (!pc_isriding(sd)) { // if actually no peco

 		if (pc_checkskill(sd, KN_RIDING)) {

-			pc_setoption(sd, sd->status.option | 0x0020);

+			pc_setoption(sd, sd->sc.option | 0x0020);

 			clif_displaymessage(fd, msg_table[102]); // Mounted Peco.

 		} else {

 			clif_displaymessage(fd, msg_table[213]); // You can not mount a peco with your job.

 			return -1;

 		}

 	} else {	//Dismount

-		pc_setoption(sd, sd->status.option & ~0x0020);

+		pc_setoption(sd, sd->sc.option & ~0x0020);

 		clif_displaymessage(fd, msg_table[214]); // Unmounted Peco.

 	}

 

@@ -5789,14 +5789,14 @@ int atcommand_char_mount_peco(
 

 		if (!pc_isriding(pl_sd)) { // if actually no peco

 			if (pc_checkskill(pl_sd, KN_RIDING)) {

-				pc_setoption(pl_sd, pl_sd->status.option | 0x0020);

+				pc_setoption(pl_sd, pl_sd->sc.option | 0x0020);

 				clif_displaymessage(fd, msg_table[216]); // Mounted Peco.

 			} else {

 				clif_displaymessage(fd, msg_table[217]); // You can not mount a peco with your job.

 				return -1;

 			}

 		} else {	//Dismount

-			pc_setoption(pl_sd, pl_sd->status.option & ~0x0020);

+			pc_setoption(pl_sd, pl_sd->sc.option & ~0x0020);

 			clif_displaymessage(fd, msg_table[218]); // Unmounted Peco.

 		}

 	} else {

@@ -8258,7 +8258,7 @@ int atcommand_unmute(
         	return -1;

 

 	if((pl_sd=map_nick2sd((char *) message)) != NULL) {

-		if(pl_sd->sc_data[SC_NOCHAT].timer!=-1) {

+		if(pl_sd->sc.data[SC_NOCHAT].timer!=-1) {

 			pl_sd->status.manner = 0; // have to set to 0 first [celest]

 			status_change_end(&pl_sd->bl,SC_NOCHAT,-1);

 			clif_displaymessage(sd->fd,"Player unmuted");

@@ -9995,7 +9995,7 @@ int atcommand_main(
 				sd->state.mainchat = 1;

 				clif_displaymessage(fd, msg_txt(380)); // Main chat has been activated.

 			}

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

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

 				clif_displaymessage(fd, msg_txt(387));

 				return -1;

 			}