From d8d87bbaf74bf6b013b5cdcd2e9602f1892bbd71 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 15 Nov 2014 16:04:54 +0300
Subject: map: move script defines into separate file.
---
src/Makefile.am | 1 +
src/map/script.c | 28 +---------------------------
src/map/scriptdefines.h | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+), 27 deletions(-)
create mode 100644 src/map/scriptdefines.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 4204ff5..027d4f6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,6 +19,7 @@ MAP_SRC = map/dummy.c \
map/pc.h \
map/script.c \
map/script.h \
+ map/scriptdefines.h \
map/send.c \
map/send.h \
map/session.c \
diff --git a/src/map/script.c b/src/map/script.c
index 371d17b..fffaa70 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -16,37 +16,11 @@
#include "../../../map/script.h"
#include "map/script.h"
+#include "map/scriptdefines.h"
#include "map/send.h"
#include "map/session.h"
#include "map/sessionext.h"
-#define getDataReturn(def) \
- if (!st->rid) \
- { \
- script_pushint(st, def); \
- return true; \
- } \
- TBL_PC *sd = script->rid2sd(st); \
- if (!sd) \
- { \
- script_pushint(st, def); \
- return true; \
- } \
- struct SessionExt *data = session_get(sd->fd)
-
-#define getData() \
- if (!st->rid) \
- return true; \
- TBL_PC *sd = script->rid2sd(st); \
- if (!sd) \
- return true; \
- struct SessionExt *data = session_get(sd->fd)
-
-#define getSD() \
- TBL_PC *sd = script->rid2sd(st); \
- if (!sd) \
- return 1
-
BUILDIN(l)
{
// for now not translate and not use format parameters
diff --git a/src/map/scriptdefines.h b/src/map/scriptdefines.h
new file mode 100644
index 0000000..56f32b6
--- /dev/null
+++ b/src/map/scriptdefines.h
@@ -0,0 +1,34 @@
+// Copyright (c) Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// Copyright (c) 2014 Evol developers
+
+#ifndef EVOL_MAP_SCRIPTDEFINES
+#define EVOL_MAP_SCRIPTDEFINES
+
+#define getDataReturn(def) \
+ if (!st->rid) \
+ { \
+ script_pushint(st, def); \
+ return true; \
+ } \
+ TBL_PC *sd = script->rid2sd(st); \
+ if (!sd) \
+ { \
+ script_pushint(st, def); \
+ return true; \
+ } \
+ struct SessionExt *data = session_get(sd->fd)
+
+#define getData() \
+ if (!st->rid) \
+ return true; \
+ TBL_PC *sd = script->rid2sd(st); \
+ if (!sd) \
+ return true; \
+ struct SessionExt *data = session_get(sd->fd)
+
+#define getSD() \
+ TBL_PC *sd = script->rid2sd(st); \
+ if (!sd) \
+ return 1
+
+#endif // EVOL_MAP_SCRIPTDEFINES
--
cgit v1.2.3-70-g09d2