summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-11-15 16:04:54 +0300
committerAndrei Karas <akaras@inbox.ru>2014-11-15 16:04:54 +0300
commitd8d87bbaf74bf6b013b5cdcd2e9602f1892bbd71 (patch)
tree50d378046ac48456e9e62e09951b4f6621283b9c /src/map
parent9e1580014b92a465c874086fde4d64cd69034ba5 (diff)
downloadevol-hercules-d8d87bbaf74bf6b013b5cdcd2e9602f1892bbd71.tar.gz
evol-hercules-d8d87bbaf74bf6b013b5cdcd2e9602f1892bbd71.tar.bz2
evol-hercules-d8d87bbaf74bf6b013b5cdcd2e9602f1892bbd71.tar.xz
evol-hercules-d8d87bbaf74bf6b013b5cdcd2e9602f1892bbd71.zip
map: move script defines into separate file.
Diffstat (limited to 'src/map')
-rw-r--r--src/map/script.c28
-rw-r--r--src/map/scriptdefines.h34
2 files changed, 35 insertions, 27 deletions
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