diff options
| author | mekolat <mekolat@gmail.com> | 2015-04-03 14:20:01 -0400 |
|---|---|---|
| committer | wushin <pasekei@gmail.com> | 2015-04-04 00:27:43 -0500 |
| commit | ee8dff7687f120cbe55dccc56c1ae1f711bb68b5 (patch) | |
| tree | 04d071bbd1799e4b5f3b33d32bed99098b7d6acb /src/map/script-fun.cpp | |
| parent | 7f31bde507bee63e36ddaefd5d16ab314b98b601 (diff) | |
| download | tmwa-ee8dff7687f120cbe55dccc56c1ae1f711bb68b5.tar.gz tmwa-ee8dff7687f120cbe55dccc56c1ae1f711bb68b5.tar.bz2 tmwa-ee8dff7687f120cbe55dccc56c1ae1f711bb68b5.tar.xz tmwa-ee8dff7687f120cbe55dccc56c1ae1f711bb68b5.zip | |
make pvp use channels
Diffstat (limited to 'src/map/script-fun.cpp')
| -rw-r--r-- | src/map/script-fun.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp index f08cf60..1d587fd 100644 --- a/src/map/script-fun.cpp +++ b/src/map/script-fun.cpp @@ -2176,15 +2176,15 @@ void builtin_pvpoff(ScriptState *st) } static -void builtin_pvp(ScriptState *st) +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 = 1; + if (flag < 1) + flag = 0; - sd->state.pvpon = flag; + sd->state.pvpchannel = flag; } static @@ -2196,7 +2196,7 @@ void builtin_getpvpflag(ScriptState *st) switch (num){ case 0: - flag = sd->state.pvpon; + flag = sd->state.pvpchannel; break; case 1: flag = bool(sd->status.option & Opt0::HIDE); @@ -3109,7 +3109,7 @@ BuiltinFunction builtin_functions[] = BUILTIN(getmapflag, "Mi"_s, 'i'), BUILTIN(pvpon, "M"_s, '\0'), BUILTIN(pvpoff, "M"_s, '\0'), - BUILTIN(pvp, "i"_s, '\0'), + BUILTIN(setpvpchannel, "i"_s, '\0'), BUILTIN(getpvpflag, "i"_s, 'i'), BUILTIN(emotion, "i"_s, '\0'), BUILTIN(mapwarp, "MMxy"_s, '\0'), |