From ee8dff7687f120cbe55dccc56c1ae1f711bb68b5 Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@gmail.com>
Date: Fri, 3 Apr 2015 14:20:01 -0400
Subject: make pvp use channels

---
 src/map/atcommand.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/map/atcommand.cpp')

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;
 }
 
-- 
cgit v1.2.3-70-g09d2