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/atcommand.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/atcommand.cpp')
| -rw-r--r-- | src/map/atcommand.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp index 2a5791e..7c165ef 100644 --- a/src/map/atcommand.cpp +++ b/src/map/atcommand.cpp @@ -4033,17 +4033,19 @@ static ATCE atcommand_pvp(Session *s, dumb_ptr<map_session_data> sd, ZString) { - if (sd->pvp_timer) + int chan = sd->state.pvpchannel; + if (sd->pvp_timer || (chan > 1)) return ATCE::OKAY; - sd->state.pvpon = !sd->state.pvpon; - pc_setpvptimer(sd, battle_config.player_pvp_time); - - if (sd->state.pvpon) + if (chan < 1) { + sd->state.pvpchannel = 1; clif_displaymessage(s, "##3PvP : ##BOn"_s); - else + } else { + sd->state.pvpchannel = 0; clif_displaymessage(s, "##3PvP : ##BOff"_s); + } + pc_setpvptimer(sd, battle_config.player_pvp_time); return ATCE::OKAY; } |