diff options
| author | Wushin <pasekei@gmail.com> | 2015-04-13 21:13:52 -0500 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2015-04-13 21:13:52 -0500 |
| commit | bf54afff27cd03ed535859009baa0b4c4fa663e9 (patch) | |
| tree | 92b3e0ab2e6e668da98cc023b27858e7c5fef419 /src/map/script-fun.cpp | |
| parent | c776b7a5d8075ede4a364bfdd0c6fb3cb6f6c5fa (diff) | |
| parent | 8e8876474eddefe474528c73851b3af2c6d9327f (diff) | |
| download | tmwa-bf54afff27cd03ed535859009baa0b4c4fa663e9.tar.gz tmwa-bf54afff27cd03ed535859009baa0b4c4fa663e9.tar.bz2 tmwa-bf54afff27cd03ed535859009baa0b4c4fa663e9.tar.xz tmwa-bf54afff27cd03ed535859009baa0b4c4fa663e9.zip | |
Merge pull request #41 from wushin/pvp-script-persistance
Make killer & killable script builtins
Diffstat (limited to 'src/map/script-fun.cpp')
| -rw-r--r-- | src/map/script-fun.cpp | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp index da26e2b..8300d38 100644 --- a/src/map/script-fun.cpp +++ b/src/map/script-fun.cpp @@ -2156,6 +2156,37 @@ void builtin_pvpoff(ScriptState *st) } } +static +void builtin_setpvpchannel(ScriptState *st) +{ + dumb_ptr<map_session_data> sd = script_rid2sd(st); + int flag; + flag = conv_num(st, &AARG(0)); + if (flag < 1) + flag = 0; + + sd->state.pvpchannel = flag; +} + +static +void builtin_getpvpflag(ScriptState *st) +{ + dumb_ptr<map_session_data> sd = script_rid2sd(st); + int num = conv_num(st, &AARG(0)); + int flag = 0; + + switch (num){ + case 0: + flag = sd->state.pvpchannel; + break; + case 1: + flag = bool(sd->status.option & Opt0::HIDE); + break; + } + + push_int<ScriptDataInt>(st->stack, flag); +} + /*========================================== * NPCエモーション *------------------------------------------ @@ -3163,6 +3194,8 @@ BuiltinFunction builtin_functions[] = BUILTIN(getmapflag, "Mi"_s, 'i'), BUILTIN(pvpon, "M"_s, '\0'), BUILTIN(pvpoff, "M"_s, '\0'), + BUILTIN(setpvpchannel, "i"_s, '\0'), + BUILTIN(getpvpflag, "i"_s, 'i'), BUILTIN(emotion, "i"_s, '\0'), BUILTIN(mapwarp, "MMxy"_s, '\0'), BUILTIN(mobcount, "ME"_s, 'i'), |