From edb279bdc22d94a88aabdd994bed5dd2b1c5659e Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 3 Aug 2016 19:15:13 +0300
Subject: Add actor type elemental.

---
 src/actormanager.cpp         |  1 +
 src/being/being.cpp          | 10 +++++++---
 src/enums/being/actortype.h  |  3 ++-
 src/gui/popups/popupmenu.cpp |  2 ++
 src/gui/viewport.cpp         |  1 +
 src/gui/windows/minimap.cpp  |  1 +
 6 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/actormanager.cpp b/src/actormanager.cpp
index 59524b9e9..befd952e6 100644
--- a/src/actormanager.cpp
+++ b/src/actormanager.cpp
@@ -596,6 +596,7 @@ void ActorManager::findBeingsByPixel(std::vector<ActorSprite*> &beings,
             case ActorType::Mercenary:
             case ActorType::Homunculus:
             case ActorType::SkillUnit:
+            case ActorType::Elemental:
             {
                 const Being *const being = static_cast<const Being*>(*it);
                 if (!being)
diff --git a/src/being/being.cpp b/src/being/being.cpp
index d762dee24..35e9356bc 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -498,6 +498,7 @@ void Being::setSubtype(const BeingTypeId subtype,
             break;
         case ActorType::Unknown:
         case ActorType::FloorItem:
+        case ActorType::Elemental:
         default:
             reportAlways("Wrong being type %d in setSubType",
                 CAST_S32(mType));
@@ -3620,16 +3621,17 @@ void Being::draw(Graphics *restrict const graphics,
                 offsetX,
                 offsetY);
             break;
-        case ActorType::Pet:
-        case ActorType::SkillUnit:
-        case ActorType::Unknown:
         case ActorType::Monster:
             drawMonster(graphics,
                 offsetX,
                 offsetY);
             break;
+        case ActorType::Pet:
+        case ActorType::SkillUnit:
+        case ActorType::Unknown:
         case ActorType::Npc:
         case ActorType::FloorItem:
+        case ActorType::Elemental:
 #ifdef TMWA_SUPPORT
         case ActorType::LocalPet:
 #endif
@@ -4434,6 +4436,7 @@ std::string Being::loadComment(const std::string &restrict name,
         case ActorType::Homunculus:
         case ActorType::Pet:
         case ActorType::SkillUnit:
+        case ActorType::Elemental:
         default:
             return "";
     }
@@ -4474,6 +4477,7 @@ void Being::saveComment(const std::string &restrict name,
         case ActorType::Mercenary:
         case ActorType::Homunculus:
         case ActorType::SkillUnit:
+        case ActorType::Elemental:
         default:
             return;
     }
diff --git a/src/enums/being/actortype.h b/src/enums/being/actortype.h
index 68e046690..949355933 100644
--- a/src/enums/being/actortype.h
+++ b/src/enums/being/actortype.h
@@ -39,7 +39,8 @@ enumStart(ActorType)
     Pet,
     Mercenary,
     Homunculus,
-    SkillUnit
+    SkillUnit,
+    Elemental
 }
 enumEnd(ActorType);
 
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 2e153b0a8..d0896efaa 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -430,6 +430,7 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being)
         case ActorType::Unknown:
         case ActorType::FloorItem:
         case ActorType::Portal:
+        case ActorType::Elemental:
 #ifdef TMWA_SUPPORT
         case ActorType::LocalPet:
 #endif
@@ -3200,6 +3201,7 @@ void PopupMenu::showGMPopup(const std::string &name)
             case ActorType::LocalPet:
 #endif
             case ActorType::Avatar:
+            case ActorType::Elemental:
                 break;
         }
     }
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index ab3d31588..485c93e44 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -901,6 +901,7 @@ void Viewport::mouseMoved(MouseEvent &event)
             case ActorType::Mercenary:
             case ActorType::Homunculus:
             case ActorType::SkillUnit:
+            case ActorType::Elemental:
                 gui->setCursorType(mHoverBeing->getHoverCursor());
                 break;
 
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index 606b1ce7e..8d1bab734 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -372,6 +372,7 @@ void Minimap::draw2(Graphics *const graphics)
                 case ActorType::Unknown:
                 case ActorType::Player:
                 case ActorType::FloorItem:
+                case ActorType::Elemental:
                 default:
                     continue;
             }
-- 
cgit v1.2.3-60-g2f50