summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-10 23:38:11 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-10 23:38:11 +0300
commit69022cd939e572feadaadf1041ae7dadad782ed6 (patch)
treef834f3c8ccbcceec55bc7950cd1f6d9bf877e77e /src/being
parentfe921bd36d4b2ac70ac6c815c166ec8fd9a210aa (diff)
downloadplus-69022cd939e572feadaadf1041ae7dadad782ed6.tar.gz
plus-69022cd939e572feadaadf1041ae7dadad782ed6.tar.bz2
plus-69022cd939e572feadaadf1041ae7dadad782ed6.tar.xz
plus-69022cd939e572feadaadf1041ae7dadad782ed6.zip
Rename PET type into LOCAL_PET.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/actortype.h2
-rw-r--r--src/being/being.cpp6
2 files changed, 4 insertions, 4 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);