Merge branch 'slide' into 'master' s20160912s20160911

add slide buildin



See merge request !3

3 files changed, 26 insertions, 0 deletions

diff --git a/src/emap/init.c b/src/emap/init.c
index 2f54a75..d7b3415 100644
--- a/src/emap/init.c
+++ b/src/emap/init.c
@@ -185,6 +185,7 @@ HPExport void plugin_init (void)
     addScriptCommand("getlabel", "l", getLabel);
     addScriptCommand("tolabel", "i", toLabel);
     addScriptCommand("input", "r??", input);
+    addScriptCommand("slide", "ii", slide);
 
     do_init_langs();
 
diff --git a/src/emap/script_buildins.c b/src/emap/script_buildins.c
index 75c3308..1acae6b 100644
--- a/src/emap/script_buildins.c
+++ b/src/emap/script_buildins.c
@@ -2175,3 +2175,27 @@ BUILDIN(input)
     }
     return true;
 }
+
+BUILDIN(slide)
+{
+    getSDReturn(false);
+    const int x = script_getnum(st,2);
+    const int y = script_getnum(st,3);
+    const int16 m = sd->bl.m;
+
+    if (x < 0 || x >= map->list[m].xs || y < 0 || y >= map->list[m].ys)
+    {
+        ShowError("slide: attempt to place player %s (%d:%d) on invalid coordinates (%d,%d)\n", sd->status.name, sd->status.account_id, sd->status.char_id, x, y);
+        script->reportsrc(st);
+        return false;
+    }
+
+    if (map->getcell(m, &sd->bl, x, y, CELL_CHKNOPASS) && pc_get_group_level(sd) < battle->bc->gm_ignore_warpable_area)
+    {
+        return false;
+    }
+
+    clif->slide(&sd->bl, x, y);
+    unit->movepos(&sd->bl, x, y, 1, 0);
+    return true;
+}
diff --git a/src/emap/script_buildins.h b/src/emap/script_buildins.h
index 51956bf..07c42b6 100644
--- a/src/emap/script_buildins.h
+++ b/src/emap/script_buildins.h
@@ -88,5 +88,6 @@ BUILDIN(setFakeCells);
 BUILDIN(getLabel);
 BUILDIN(toLabel);
 BUILDIN(input);
+BUILDIN(slide);
 
 #endif  // EVOL_MAP_SCRIPT_BUILDINS