From ee1866152f0bc2bdcc3f8a0c2597f0fe7de2a25d Mon Sep 17 00:00:00 2001
From: Cydh Ramdh <house.bad@gmail.com>
Date: Sat, 21 Mar 2015 19:56:43 +0700
Subject: [PATCH] Follow up 5f21afb2555d73bba219fd9fdb1d117c0e1950b1

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
---
 src/map/script.c | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/map/script.c b/src/map/script.c
index 56ea823a35..af81bf4a5f 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -170,6 +170,8 @@
 #define SCRIPT_BLOCK_SIZE 512
 enum { LABEL_NEXTLINE=1,LABEL_START };
 
+TBL_PC *script_rid2sd(struct script_state *st);
+
 /**
  * Get `sd` from an account id in `loc` param instead of attached rid
  * @param loc Location to look account id in script parameter
@@ -212,24 +214,22 @@ enum { LABEL_NEXTLINE=1,LABEL_START };
 
 /**
  * Get `sd` from a nick in `loc` param instead of attached rid
+ * @param st Script
  * @param loc Location to look nick in script parameter
  * @param sd Variable that will be assigned
  * @param ret Optional action when fail to get sd
  **/
-#define script_nick2sd(loc, sd, ret) {\
-	if (script_hasdata(st, (loc))) {\
-		if (!((sd) = map_nick2sd(script_getstr(st, loc)))) {\
-			ShowError("%s: Player with nick %s is not found.\n", __FUNCTION__, script_getstr(st, (loc)));\
-			(ret);\
-			return SCRIPT_CMD_FAILURE;\
-		}\
-	}\
-	else if (!((sd) = script_rid2sd(st))) {\
-		(ret);\
-		return SCRIPT_CMD_FAILURE;\
-	}\
+static void script_nick2sd_(struct script_state *st, uint8 loc, struct map_session_data **sd, const char *func) {
+	if (script_hasdata(st, loc)) {
+		if (!(*sd = map_nick2sd(script_getstr(st, loc))))
+			ShowError("%s: Player with nick %s is not found.\n", func, script_getstr(st, loc));
+	}
+	else
+		*sd = script_rid2sd(st);
 }
 
+#define script_nick2sd(loc,sd) script_nick2sd_(st,(loc),&(sd),__FUNCTION__)
+
 /// temporary buffer for passing around compiled bytecode
 /// @see add_scriptb, set_label, parse_script
 static unsigned char* script_buf = NULL;
@@ -7480,7 +7480,11 @@ BUILDIN_FUNC(readparam)
 	TBL_PC *sd;
 
 	type = script_getnum(st,2);
-	script_nick2sd(3, sd, script_pushint(st,-1));
+	script_nick2sd(3,sd);
+	if (!sd) {
+		script_pushint(st,-1);
+		return SCRIPT_CMD_FAILURE;
+	}
 	script_pushint(st,pc_readparam(sd,type));
 	return SCRIPT_CMD_SUCCESS;
 }