Renamed ismounting, setmounting, @mount2

To avoid ambiguity:
- The script command ismounting is now hascashmount
- The script command setmounting is now setcashmount
- The at-command @mount2 is now @cashmount

Signed-off-by: Haru <haru@dotalux.com>

2 files changed, 17 insertions, 13 deletions

diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 9472fe36d..ef528c454 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -8357,7 +8357,8 @@ ACMD(charcommands)
 	return true;
 }
 /* for new mounts */
-ACMD(mount2) {
+ACMD(cashmount)
+{
 	
 	if (pc_hasmount(sd)) {
 		clif->message(fd, msg_txt(1476)); // You are already mounting something else
@@ -8365,7 +8366,7 @@ ACMD(mount2) {
 	}
 	
 	clif->message(sd->fd,msg_txt(1362)); // NOTICE: If you crash with mount your LUA is outdated.
-	if( !(sd->sc.data[SC_ALL_RIDING]) ) {
+	if (!sd->sc.data[SC_ALL_RIDING]) {
 		clif->message(sd->fd,msg_txt(1363)); // You have mounted.
 		sc_start(NULL,&sd->bl,SC_ALL_RIDING,100,0,-1);
 	} else {
@@ -9633,7 +9634,7 @@ void atcommand_basecommands(void) {
 		ACMD_DEF2("rmvperm", addperm),
 		ACMD_DEF(unloadnpcfile),
 		ACMD_DEF(cart),
-		ACMD_DEF(mount2),
+		ACMD_DEF(cashmount),
 		ACMD_DEF(join),
 		ACMD_DEF(channel),
 		ACMD_DEF(fontcolor),
diff --git a/src/map/script.c b/src/map/script.c
index 24011c910..f71b0e64b 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -17363,9 +17363,10 @@ BUILDIN(setdragon) {
 }
 
 /**
- * ismounting() returns 1 if mounting a new mount or 0 otherwise
+ * hascashmount() returns 1 if mounting a cash mount or 0 otherwise
  **/
-BUILDIN(ismounting) {
+BUILDIN(hascashmount)
+{
 	TBL_PC* sd;
 	if( (sd = script->rid2sd(st)) == NULL )
 		return true;
@@ -17377,12 +17378,14 @@ BUILDIN(ismounting) {
 }
 
 /**
- * setmounting() returns 1 on success or 0 otherwise
- * - Toggles new mounts on a player when he can mount
- * - Will fail if the player is mounting a non-new mount, e.g. dragon, peco, wug, etc.
- * - Will unmount the player is he is already mounting
+ * setcashmount() returns 1 on success or 0 otherwise
+ *
+ * - Toggles cash mounts on a player when he can mount
+ * - Will fail if the player is already riding a standard mount e.g. dragon, peco, wug, mado, etc.
+ * - Will unmount the player is he is already mounting a cash mount
  **/
-BUILDIN(setmounting) {
+BUILDIN(setcashmount)
+{
 	TBL_PC* sd;
 	if ((sd = script->rid2sd(st)) == NULL)
 		return true;
@@ -17390,7 +17393,7 @@ BUILDIN(setmounting) {
 		clif->msgtable(sd->fd, 0X78b);
 		script_pushint(st,0);//can't mount with one of these
 	} else {
-		if( sd->sc.data[SC_ALL_RIDING] )
+		if (sd->sc.data[SC_ALL_RIDING])
 			status_change_end(&sd->bl, SC_ALL_RIDING, INVALID_TIMER);
 		else
 			sc_start(NULL,&sd->bl, SC_ALL_RIDING, 100, 0, -1);
@@ -19303,8 +19306,8 @@ void script_parse_builtin(void) {
 		BUILDIN_DEF(makerune,"i"),
 		BUILDIN_DEF(checkdragon,""),//[Ind]
 		BUILDIN_DEF(setdragon,"?"),//[Ind]
-		BUILDIN_DEF(ismounting,""),//[Ind]
-		BUILDIN_DEF(setmounting,""),//[Ind]
+		BUILDIN_DEF(hascashmount,""),//[Ind]
+		BUILDIN_DEF(setcashmount,""),//[Ind]
 		BUILDIN_DEF(checkre,"i"),
 		/**
 		 * rAthena and beyond!