summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/being/actortype.h2
-rw-r--r--src/being/being.cpp6
-rw-r--r--src/gui/popups/popupmenu.cpp2
-rw-r--r--src/gui/viewport.cpp4
-rw-r--r--src/gui/windows/minimap.cpp2
5 files changed, 8 insertions, 8 deletions
diff --git a/src/being/actortype.h b/src/being/actortype.h
index f57d6662b..7603616ce 100644
--- a/src/being/actortype.h
+++ b/src/being/actortype.h
@@ -32,7 +32,7 @@ namespace ActorType
MONSTER,
FLOOR_ITEM,
PORTAL,
- PET,
+ LOCAL_PET,
AVATAR
};
} // namespace ActorType
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 8baab8a44..b69ceaa4a 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -314,7 +314,7 @@ void Being::setSubtype(const uint16_t subtype, const uint8_t look)
if (mInfo)
setupSpriteDisplay(mInfo->getDisplay(), false);
}
- else if (mType == ActorType::PET)
+ else if (mType == ActorType::LOCAL_PET)
{
mInfo = PETDB::get(mId);
if (mInfo)
@@ -2915,7 +2915,7 @@ std::string Being::loadComment(const std::string &name,
case ActorType::MONSTER:
case ActorType::FLOOR_ITEM:
case ActorType::PORTAL:
- case ActorType::PET:
+ case ActorType::LOCAL_PET:
case ActorType::AVATAR:
default:
return "";
@@ -3134,7 +3134,7 @@ void Being::addPet(const int id)
}
Being *const being = actorManager->createBeing(
- id, ActorType::PET, 0);
+ id, ActorType::LOCAL_PET, 0);
if (being)
{
being->setOwner(this);
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index cc73cbc59..d478719b2 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -303,7 +303,7 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being)
case ActorType::UNKNOWN:
case ActorType::FLOOR_ITEM:
case ActorType::PORTAL:
- case ActorType::PET:
+ case ActorType::LOCAL_PET:
default:
break;
}
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 96cd080da..8d9fcd958 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -762,7 +762,7 @@ void Viewport::mouseMoved(MouseEvent &event A_UNUSED)
if (mHoverBeing
&& (type == ActorType::PLAYER
|| type == ActorType::NPC
- || type == ActorType::PET))
+ || type == ActorType::LOCAL_PET))
{
popupManager->hideTextPopup();
if (mShowBeingPopup && beingPopup)
@@ -831,7 +831,7 @@ void Viewport::mouseMoved(MouseEvent &event A_UNUSED)
case ActorType::FLOOR_ITEM:
case ActorType::UNKNOWN:
case ActorType::PLAYER:
- case ActorType::PET:
+ case ActorType::LOCAL_PET:
default:
gui->setCursorType(Cursor::CURSOR_POINTER);
break;
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index b3a131960..048b4350e 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -332,7 +332,7 @@ void Minimap::draw(Graphics *graphics)
case ActorType::PLAYER:
case ActorType::FLOOR_ITEM:
case ActorType::PORTAL:
- case ActorType::PET:
+ case ActorType::LOCAL_PET:
default:
continue;
}