- A bit more work on Ticket #41.

- Added 'r' (variable reference) to the script argument definitions.
- Added a simple define for suspitious actions. (empty at the moment)
- Added clif_clearcart and moved sending cart packets to pc_setoption.
- clif_parse_ChangeCart checking the player level.

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

1 files changed, 4 insertions, 8 deletions

diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 9a427547c..98304925a 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -2218,10 +2218,6 @@ int atcommand_option(const int fd, struct map_session_data* sd, const char* comm
 
 	sd->sc.opt1 = param1;
 	sd->sc.opt2 = param2;
-	if (!(sd->sc.option & OPTION_CART) && param3 & OPTION_CART) {
-		clif_cartlist(sd);
-		clif_updatestatus(sd, SP_CARTINFO);
-	}
 	pc_setoption(sd, param3);
 	
 	clif_displaymessage(fd, msg_txt(9)); // Options changed.
@@ -5666,14 +5662,14 @@ int atcommand_mount_peco(const int fd, struct map_session_data* sd, const char*
 
 	if (!pc_isriding(sd)) { // if actually no peco
 		if (pc_checkskill(sd, KN_RIDING)) {
-			pc_setoption(sd, sd->sc.option | 0x0020);
+			pc_setoption(sd, sd->sc.option | OPTION_RIDING);
 			clif_displaymessage(fd, msg_txt(102)); // Mounted Peco.
 		} else {
 			clif_displaymessage(fd, msg_txt(213)); // You can not mount a peco with your job.
 			return -1;
 		}
 	} else {	//Dismount
-		pc_setoption(sd, sd->sc.option & ~0x0020);
+		pc_setoption(sd, sd->sc.option & ~OPTION_RIDING);
 		clif_displaymessage(fd, msg_txt(214)); // Unmounted Peco.
 	}
 
@@ -5700,14 +5696,14 @@ int atcommand_char_mount_peco(const int fd, struct map_session_data* sd, const c
 
 		if (!pc_isriding(pl_sd)) { // if actually no peco
 			if (pc_checkskill(pl_sd, KN_RIDING)) {
-				pc_setoption(pl_sd, pl_sd->sc.option | 0x0020);
+				pc_setoption(pl_sd, pl_sd->sc.option | OPTION_RIDING);
 				clif_displaymessage(fd, msg_txt(216)); // Mounted Peco.
 			} else {
 				clif_displaymessage(fd, msg_txt(217)); // You can not mount a peco with your job.
 				return -1;
 			}
 		} else {	//Dismount
-			pc_setoption(pl_sd, pl_sd->sc.option & ~0x0020);
+			pc_setoption(pl_sd, pl_sd->sc.option & ~OPTION_RIDING);
 			clif_displaymessage(fd, msg_txt(218)); // Unmounted Peco.
 		}
 	} else {