Change format in ActorType enum.

8 files changed, 22 insertions, 22 deletions

diff --git a/src/gui/windows/botcheckerwindow.cpp b/src/gui/windows/botcheckerwindow.cpp
index d0130ed7a..25df25a69 100644
--- a/src/gui/windows/botcheckerwindow.cpp
+++ b/src/gui/windows/botcheckerwindow.cpp
@@ -193,7 +193,7 @@ void BotCheckerWindow::reset()
         {
             Being *const being = dynamic_cast<Being*>(*i);
 
-            if (being && being->getType() == ActorType::PLAYER
+            if (being && being->getType() == ActorType::Player
                 && being != localPlayer && being->getName() != "")
             {
                 being->resetCounters();
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index e1c1cd7ed..890abfe22 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -128,7 +128,7 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent,
     mCreateButton(new Button(this, _("Create"), "create", this)),
     // TRANSLATORS: char create dialog button
     mCancelButton(new Button(this, _("Cancel"), "cancel", this)),
-    mPlayer(new Being(0, ActorType::PLAYER, static_cast<uint16_t>(0U),
+    mPlayer(new Being(0, ActorType::Player, static_cast<uint16_t>(0U),
             nullptr)),
     mPlayerBox(new PlayerBox(this, mPlayer, "charcreate_playerbox.xml",
         "charcreate_selectedplayerbox.xml")),
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 0efa9c08d..9644b5a7c 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -623,7 +623,7 @@ void ChatWindow::doPresent() const
 
     FOR_EACH (ActorSpritesIterator, it, actors)
     {
-        if ((*it)->getType() == ActorType::PLAYER)
+        if ((*it)->getType() == ActorType::Player)
         {
             if (!response.empty())
                 response.append(", ");
@@ -1508,7 +1508,7 @@ void ChatWindow::battleChatLog(const std::string &line, ChatMsgType::Type own,
 void ChatWindow::localPetSay(const std::string &nick, const std::string &text)
 {
     Being *const being = actorManager->findBeingByName(
-        nick, ActorType::PLAYER);
+        nick, ActorType::Player);
     Being *pet = nullptr;
     if (being)
     {
@@ -1533,7 +1533,7 @@ void ChatWindow::localPetSay(const std::string &nick, const std::string &text)
 void ChatWindow::localPetEmote(const std::string &nick, const uint8_t emoteId)
 {
     Being *const being = actorManager->findBeingByName(
-        nick, ActorType::PLAYER);
+        nick, ActorType::Player);
     if (being)
     {
         Being *const pet = being->getFirstPet();
@@ -1595,7 +1595,7 @@ void ChatWindow::updateOnline(const std::set<std::string> &onlinePlayers) const
             if (actorManager)
             {
                 const Being *const being = actorManager->findBeingByName(
-                    nick, ActorType::PLAYER);
+                    nick, ActorType::Player);
                 if (being)
                 {
                     tab->setWhisperTabColors();
diff --git a/src/gui/windows/killstats.cpp b/src/gui/windows/killstats.cpp
index 6ec3df5a0..677023c8b 100644
--- a/src/gui/windows/killstats.cpp
+++ b/src/gui/windows/killstats.cpp
@@ -484,7 +484,7 @@ void KillStats::validateJacko()
             {
                 const Being *const dstBeing
                     = actorManager->findBeingByName(
-                    "Jack O", ActorType::MONSTER);
+                    "Jack O", ActorType::Monster);
                 if (mIsJackoAlive && !dstBeing)
                 {
                     mIsJackoAlive = false;
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index 048b4350e..e242b7401 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -291,7 +291,7 @@ void Minimap::draw(Graphics *graphics)
     const ActorSprites &actors = actorManager->getAll();
     FOR_EACH (ActorSpritesConstIterator, it, actors)
     {
-        if (!(*it) || (*it)->getType() == ActorType::FLOOR_ITEM)
+        if (!(*it) || (*it)->getType() == ActorType::FloorItem)
             continue;
 
         const Being *const being = static_cast<const Being *const>(*it);
@@ -319,20 +319,20 @@ void Minimap::draw(Graphics *graphics)
         {
             switch (being->getType())
             {
-                case ActorType::MONSTER:
+                case ActorType::Monster:
                     type = UserPalette::MONSTER;
                     break;
 
-                case ActorType::NPC:
+                case ActorType::Npc:
                     type = UserPalette::NPC;
                     break;
 
-                case ActorType::AVATAR:
-                case ActorType::UNKNOWN:
-                case ActorType::PLAYER:
-                case ActorType::FLOOR_ITEM:
-                case ActorType::PORTAL:
-                case ActorType::LOCAL_PET:
+                case ActorType::Avatar:
+                case ActorType::Unknown:
+                case ActorType::Player:
+                case ActorType::FloorItem:
+                case ActorType::Portal:
+                case ActorType::LocalPet:
                 default:
                     continue;
             }
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index ef6a1b1ad..d528e22aa 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -852,7 +852,7 @@ void NpcDialog::showAvatar(const uint16_t avatarId)
     if (needShow)
     {
         delete mAvatarBeing;
-        mAvatarBeing = new Being(0, ActorType::AVATAR, avatarId, nullptr);
+        mAvatarBeing = new Being(0, ActorType::Avatar, avatarId, nullptr);
         mPlayerBox->setPlayer(mAvatarBeing);
         if (!mAvatarBeing->empty())
         {
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index 96ac002fa..3645ccc9b 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -299,7 +299,7 @@ void ShopWindow::startTrade()
         return;
 
     const Being *const being = actorManager->findBeingByName(
-        mTradeNick, ActorType::PLAYER);
+        mTradeNick, ActorType::Player);
     tradeWindow->clear();
     if (mTradeMoney)
     {
@@ -703,7 +703,7 @@ void ShopWindow::processRequest(const std::string &nick, std::string data,
 {
     if (!localPlayer || !mTradeNick.empty() || PlayerInfo::isTrading()
         || !actorManager
-        || !actorManager->findBeingByName(nick, ActorType::PLAYER))
+        || !actorManager->findBeingByName(nick, ActorType::Player))
     {
         return;
     }
diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp
index 2b5210775..eb44a0081 100644
--- a/src/gui/windows/whoisonline.cpp
+++ b/src/gui/windows/whoisonline.cpp
@@ -206,7 +206,7 @@ void WhoIsOnline::handleLink(const std::string& link, MouseEvent *event)
             {
                 const std::string text = decodeLinkText(link);
                 Being *const being = actorManager->findBeingByName(
-                    text, ActorType::PLAYER);
+                    text, ActorType::Player);
 
                 if (being && popupManager)
                 {
@@ -430,7 +430,7 @@ void WhoIsOnline::loadWebList()
                 if (actorManager)
                 {
                     Being *const being = actorManager->findBeingByName(
-                        nick, ActorType::PLAYER);
+                        nick, ActorType::Player);
                     if (being)
                     {
                         if (level > 0)
@@ -824,7 +824,7 @@ void OnlinePlayer::setText(std::string color)
     if (mStatus != 255 && actorManager)
     {
         Being *const being = actorManager->findBeingByName(
-            mNick, ActorType::PLAYER);
+            mNick, ActorType::Player);
         if (being)
         {
             being->setState(mStatus);