From c90ec16607f6ff4e422e2a5eca465a88af8b0af3 Mon Sep 17 00:00:00 2001
From: AnnieRuru <jeankofannie2@gmail.com>
Date: Sat, 30 Mar 2019 03:00:41 +0800
Subject: Add optional parameter for *showscript to send target to SELF only -
 also remove the useless script_pushint

---
 src/map/clif.c   |  4 ++--
 src/map/clif.h   |  2 +-
 src/map/script.c | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/map/clif.c b/src/map/clif.c
index a037d3436..4c3c746c4 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -19360,7 +19360,7 @@ static void clif_partytickack(struct map_session_data *sd, bool flag)
 	WFIFOSET(sd->fd, packet_len(0x2c9));
 }
 
-static void clif_ShowScript(struct block_list *bl, const char *message)
+static void clif_ShowScript(struct block_list *bl, const char *message, enum send_target target)
 {
 #if PACKETVER >= 20110111
 	char buf[256];
@@ -19381,7 +19381,7 @@ static void clif_ShowScript(struct block_list *bl, const char *message)
 	WBUFW(buf,2) = len+8;
 	WBUFL(buf,4) = bl->id;
 	safestrncpy(WBUFP(buf,8),message,len);
-	clif->send(buf,WBUFW(buf,2),bl,AREA);
+	clif->send(buf, WBUFW(buf,2), bl, target);
 #endif
 }
 
diff --git a/src/map/clif.h b/src/map/clif.h
index 6b501477c..6e922bdff 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -1009,7 +1009,7 @@ struct clif_interface {
 	void (*wisexin) (struct map_session_data *sd,int type,int flag);
 	void (*wisall) (struct map_session_data *sd,int type,int flag);
 	void (*PMIgnoreList) (struct map_session_data* sd);
-	void (*ShowScript) (struct block_list* bl, const char* message);
+	void (*ShowScript) (struct block_list* bl, const char* message, enum send_target target);
 	/* trade handling */
 	void (*traderequest) (struct map_session_data* sd, const char* name);
 	void (*tradestart) (struct map_session_data* sd, uint8 type);
diff --git a/src/map/script.c b/src/map/script.c
index bba559df8..ed8f6b8d2 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -24377,7 +24377,7 @@ static BUILDIN(showscript)
 {
 	struct block_list *bl = NULL;
 	const char *msg = script_getstr(st, 2);
-	int id = 0;
+	int id = 0, flag = AREA;
 
 	if (script_hasdata(st, 3)) {
 		id = script_getnum(st, 3);
@@ -24389,14 +24389,14 @@ static BUILDIN(showscript)
 
 	if (!bl) {
 		ShowError("buildin_showscript: Script not attached. (id=%d, rid=%d, oid=%d)\n", id, st->rid, st->oid);
-		script_pushint(st, 0);
 		return false;
 	}
 
-	clif->ShowScript(bl, msg);
-
-	script_pushint(st, 1);
-
+	if (script_hasdata(st, 4))
+		if (script_getnum(st, 4) == SELF)
+			flag = SELF;
+		
+	clif->ShowScript(bl, msg, flag);
 	return true;
 }
 
@@ -25822,7 +25822,7 @@ static void script_parse_builtin(void)
 		BUILDIN_DEF(channelmes, "ss"),
 		BUILDIN_DEF(addchannelhandler, "ss"),
 		BUILDIN_DEF(removechannelhandler, "ss"),
-		BUILDIN_DEF(showscript, "s?"),
+		BUILDIN_DEF(showscript, "s??"),
 		BUILDIN_DEF(mergeitem,""),
 		BUILDIN_DEF(getcalendartime, "ii??"),
 
-- 
cgit v1.2.3-60-g2f50