From 3d76d08ce39ea9f4d4d4e0f015eec74ec6653cd3 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 29 Jan 2016 00:20:54 +0300
Subject: Change script function requestitemsindex to return value.

---
 src/emap/scriptdefines.h | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'src/emap/scriptdefines.h')

diff --git a/src/emap/scriptdefines.h b/src/emap/scriptdefines.h
index 5d462f4..274f8f4 100644
--- a/src/emap/scriptdefines.h
+++ b/src/emap/scriptdefines.h
@@ -22,6 +22,24 @@
     } \
     struct SessionExt *data = session_get(sd->fd)
 
+#define getSessionDataReturnS(data, def) \
+    if (!st->rid) \
+    { \
+        ShowWarning("!st->rid\n"); \
+        script->reportsrc(st); \
+        script_pushstr(st, aStrdup(def)); \
+        return false; \
+    } \
+    TBL_PC *sd = script->rid2sd(st); \
+    if (!sd) \
+    { \
+        ShowWarning("player not attached\n"); \
+        script->reportsrc(st); \
+        script_pushstr(st, aStrdup(def)); \
+        return false; \
+    } \
+    struct SessionExt *data = session_get(sd->fd)
+
 #define getSessionData(data) \
     if (!st->rid) \
     { \
-- 
cgit v1.2.3-60-g2f50