From 9e1580014b92a465c874086fde4d64cd69034ba5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 15 Nov 2014 15:58:48 +0300 Subject: Simplify sd usage in scripts. --- src/map/script.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/map/script.c') diff --git a/src/map/script.c b/src/map/script.c index 7184707..371d17b 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -42,6 +42,11 @@ 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 @@ -69,10 +74,7 @@ BUILDIN(setLang) BUILDIN(setCamNpc) { - TBL_PC *sd = script->rid2sd(st); - if (!sd) - return 1; - + getSD(); struct npc_data *nd = NULL; int x = 0; @@ -105,10 +107,7 @@ BUILDIN(setCamNpc) BUILDIN(restoreCam) { - TBL_PC *sd = script->rid2sd(st); - if (!sd) - return 1; - + getSD(); send_npccommand(sd, st->oid, 3); return 0; } -- cgit v1.2.3-60-g2f50