From 2f8076f6c51cd969da927d12d6cd89a46899322e Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 20 Sep 2014 14:10:11 +0300
Subject: Add mercenary actor type. Use it for now in samw way with monster
 type.

---
 src/being/being.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/being/being.cpp')

diff --git a/src/being/being.cpp b/src/being/being.cpp
index 3bb1f9fd5..f52371d78 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -292,7 +292,7 @@ void Being::setSubtype(const uint16_t subtype, const uint8_t look)
     mSubType = subtype;
     mLook = look;
 
-    if (mType == ActorType::Monster)
+    if (mType == ActorType::Monster || mType == ActorType::Mercenary)
     {
         mInfo = MonsterDB::get(mSubType);
         if (mInfo)
@@ -544,7 +544,7 @@ void Being::takeDamage(Being *const attacker, const int amount,
             color = &userPalette->getColor(UserPalette::MISS);
         }
     }
-    else if (mType == ActorType::Monster)
+    else if (mType == ActorType::Monster || mType == ActorType::Mercenary)
     {
         if (attacker == localPlayer)
         {
@@ -2909,6 +2909,7 @@ std::string Being::loadComment(const std::string &name,
         case ActorType::Portal:
         case ActorType::LocalPet:
         case ActorType::Avatar:
+        case ActorType::Mercenary:
         default:
             return "";
     }
-- 
cgit v1.2.3-60-g2f50