add pvp channel support

src/being/being.cpp

@@ -213,6 +213,7 @@ Being::Being(const BeingId id,
     mMaxHit(0),
     mCriticalHit(0),
     mPvpRank(0),
+    mPvpChannel(0),
     mNumber(100),
     mUsageCounter(1),
     mKarma(0),
@@ -2349,6 +2350,7 @@ bool Being::updateFromCache()
         setGuildName(entry->getGuildName());
         setLevel(entry->getLevel());
         setPvpRank(entry->getPvpRank());
+        setPvpChannel(entry->getPvpChannel());
         setIp(entry->getIp());
 
         mAdvanced = entry->isAdvanced();
@@ -2404,6 +2406,7 @@ void Being::addToCache() const
     entry->setGuildName(getGuildName());
     entry->setTime(cur_time);
     entry->setPvpRank(getPvpRank());
+    entry->setPvpChannel(getPvpChannel());
     entry->setIp(getIp());
     entry->setAdvanced(isAdvanced());
     if (isAdvanced())

src/being/being.h

@@ -676,6 +676,12 @@ class Being notfinal : public ActorSprite,
         void setPvpRank(const unsigned int rank)
         { mPvpRank = rank; }
 
+        unsigned int getPvpChannel() const A_WARN_UNUSED
+        { return mPvpChannel; }
+
+        void setPvpChannel(const unsigned int channel)
+        { mPvpChannel = channel; }
+
         void setHP(const int n);
 
         void setMaxHP(const int hp);
@@ -1100,6 +1106,7 @@ class Being notfinal : public ActorSprite,
         int mMaxHit;
         int mCriticalHit;
         unsigned int mPvpRank;
+        unsigned int mPvpChannel;
         unsigned int mNumber;
         int mUsageCounter;
         int mKarma;

src/being/beingcacheentry.h

@@ -38,6 +38,7 @@ class BeingCacheEntry final
             mId(id),
             mLevel(0),
             mPvpRank(0),
+            mPvpChannel(0),
             mTime(0),
             mFlags(0),
             mIsAdvanced(false)
@@ -96,6 +97,12 @@ class BeingCacheEntry final
         void setPvpRank(const int r)
         { mPvpRank = r; }
 
+        unsigned getPvpChannel() const
+        { return mPvpChannel; }
+
+        void setPvpChannel(const int r)
+        { mPvpChannel = r; }
+
         std::string getIp() const
         { return mIp; }
 
@@ -122,6 +129,7 @@ class BeingCacheEntry final
         BeingId mId;              /**< Unique sprite id */
         int mLevel;
         unsigned int mPvpRank;
+        unsigned int mPvpChannel;
         int mTime;
         int mFlags;
         bool mIsAdvanced;

src/net/ea/beinghandler.cpp

@@ -415,12 +415,32 @@ void BeingHandler::processPvpSet(Net::MessageIn &msg)
     BLOCK_START("BeingHandler::processPvpSet")
     const BeingId id = msg.readBeingId("being id");
     const int rank = msg.readInt32("rank");
-    msg.readInt32("num");
+    const int channel = msg.readInt32("channel");
     if (actorManager)
     {
         Being *const dstBeing = actorManager->findBeing(id);
         if (dstBeing)
+        {
             dstBeing->setPvpRank(rank);
+            dstBeing->setPvpChannel(channel);
+            if (id != localPlayer->getId())
+            {
+                if(channel == 0 ||
+                    dstBeing->getPvpChannel() != localPlayer->getPvpChannel())
+                {
+                    dstBeing->setEnemy(false);
+                    dstBeing->addToCache();
+                    dstBeing->updateColors();
+                }
+                else if (dstBeing->getPvpChannel() == localPlayer->getPvpChannel()
+                            && channel > 0)
+                {
+                    dstBeing->setEnemy(true);
+                    dstBeing->addToCache();
+                    dstBeing->updateColors();
+                }
+            }
+        }
     }
     BLOCK_END("BeingHandler::processPvpSet")
 }