summaryrefslogtreecommitdiff
path: root/src/map/script-fun.cpp
diff options
context:
space:
mode:
authormekolat <mekolat@users.noreply.github.com>2016-11-26 18:29:16 -0500
committerGitHub <noreply@github.com>2016-11-26 18:29:16 -0500
commitf604a13e791eecdef273d517f7f6f566383cde28 (patch)
treea800f235d032eb5434761cec0a47efaf775aa0a0 /src/map/script-fun.cpp
parent8c380d5b71de0c60866fdd95c6e8d1a54459123f (diff)
parent6d5919b4f782adc453106312c394cf1b7dd9e58f (diff)
downloadtmwa-f604a13e791eecdef273d517f7f6f566383cde28.tar.gz
tmwa-f604a13e791eecdef273d517f7f6f566383cde28.tar.bz2
tmwa-f604a13e791eecdef273d517f7f6f566383cde28.tar.xz
tmwa-f604a13e791eecdef273d517f7f6f566383cde28.zip
Merge pull request #226 from mekolat/settilesv16.11.27
Implement SMSG_MAP_SET_TILES_TYPE
Diffstat (limited to 'src/map/script-fun.cpp')
-rw-r--r--src/map/script-fun.cpp33
1 files changed, 33 insertions, 0 deletions
diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp
index 8ec0d4a..2036782 100644
--- a/src/map/script-fun.cpp
+++ b/src/map/script-fun.cpp
@@ -4187,6 +4187,38 @@ void builtin_remotecmd(ScriptState *st)
}
static
+void builtin_sendcollision(ScriptState *st)
+{
+ dumb_ptr<map_session_data> sd = script_rid2sd(st);
+ MapName map_name = stringish<MapName>(ZString(conv_str(st, &AARG(0))));
+ int mask = conv_num(st, &AARG(1));
+ short x1, y1, x2, y2;
+ x1 = x2 = conv_num(st, &AARG(2));
+ y1 = y2 = conv_num(st, &AARG(3));
+
+ if (HARG(5))
+ {
+ x2 = conv_num(st, &AARG(4));
+ y2 = conv_num(st, &AARG(5));
+ if (HARG(6))
+ {
+ CharName player = stringish<CharName>(ZString(conv_str(st, &AARG(6))));
+ sd = map_nick2sd(player);
+ }
+ }
+
+ else if (HARG(4))
+ {
+ CharName player = stringish<CharName>(ZString(conv_str(st, &AARG(4))));
+ sd = map_nick2sd(player);
+ }
+
+ if (sd == nullptr)
+ return;
+ clif_update_collision(sd, x1, y1, x2, y2, map_name, mask);
+}
+
+static
void builtin_music(ScriptState *st)
{
dumb_ptr<map_session_data> sd = script_rid2sd(st);
@@ -4818,6 +4850,7 @@ BuiltinFunction builtin_functions[] =
BUILTIN(title, "s"_s, '\0'),
BUILTIN(smsg, "e??"_s, '\0'),
BUILTIN(remotecmd, "s?"_s, '\0'),
+ BUILTIN(sendcollision, "Mixy???"_s, '\0'),
BUILTIN(music, "s"_s, '\0'),
BUILTIN(mapmask, "i?"_s, '\0'),
BUILTIN(getmask, ""_s, 'i'),