summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-29 16:19:21 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-29 16:19:21 +0300
commit7bdb50605562e47f1d6ae134881c09bd42293be5 (patch)
tree935228722e4eb48f5856abec53be1ec985a0b9d6 /src/being
parent0f9ec2061c4ad6157c3186f1cab9c4d8558980b5 (diff)
downloadmv-7bdb50605562e47f1d6ae134881c09bd42293be5.tar.gz
mv-7bdb50605562e47f1d6ae134881c09bd42293be5.tar.bz2
mv-7bdb50605562e47f1d6ae134881c09bd42293be5.tar.xz
mv-7bdb50605562e47f1d6ae134881c09bd42293be5.zip
Add strong typed int type BeingTypeId.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/being.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 6c3962e7b..12209df81 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -333,7 +333,7 @@ void Being::setSubtype(const uint16_t subtype, const uint16_t look)
if (mType == ActorType::Monster)
{
- mInfo = MonsterDB::get(fromInt(mSubType, BeingId));
+ mInfo = MonsterDB::get(fromInt(mSubType, BeingTypeId));
if (mInfo)
{
setName(mInfo->getName());
@@ -347,7 +347,7 @@ void Being::setSubtype(const uint16_t subtype, const uint16_t look)
#ifdef EATHENA_SUPPORT
if (mType == ActorType::Pet)
{
- mInfo = PETDB::get(fromInt(mSubType, BeingId));
+ mInfo = PETDB::get(fromInt(mSubType, BeingTypeId));
if (mInfo)
{
setName(mInfo->getName());
@@ -360,7 +360,7 @@ void Being::setSubtype(const uint16_t subtype, const uint16_t look)
}
else if (mType == ActorType::Mercenary)
{
- mInfo = MercenaryDB::get(fromInt(mSubType, BeingId));
+ mInfo = MercenaryDB::get(fromInt(mSubType, BeingTypeId));
if (mInfo)
{
setName(mInfo->getName());
@@ -373,7 +373,7 @@ void Being::setSubtype(const uint16_t subtype, const uint16_t look)
}
if (mType == ActorType::Homunculus)
{
- mInfo = HomunculusDB::get(fromInt(mSubType, BeingId));
+ mInfo = HomunculusDB::get(fromInt(mSubType, BeingTypeId));
if (mInfo)
{
setName(mInfo->getName());
@@ -387,7 +387,7 @@ void Being::setSubtype(const uint16_t subtype, const uint16_t look)
#endif
else if (mType == ActorType::Npc)
{
- mInfo = NPCDB::get(fromInt(mSubType, BeingId));
+ mInfo = NPCDB::get(fromInt(mSubType, BeingTypeId));
if (mInfo)
{
setupSpriteDisplay(mInfo->getDisplay(), ForceDisplay_false);
@@ -396,13 +396,13 @@ void Being::setSubtype(const uint16_t subtype, const uint16_t look)
}
else if (mType == ActorType::Avatar)
{
- mInfo = AvatarDB::get(fromInt(mSubType, BeingId));
+ mInfo = AvatarDB::get(fromInt(mSubType, BeingTypeId));
if (mInfo)
setupSpriteDisplay(mInfo->getDisplay(), ForceDisplay_false);
}
else if (mType == ActorType::LocalPet)
{
- mInfo = PETDB::get(mId);
+ mInfo = PETDB::get(fromInt(mId, BeingTypeId));
if (mInfo)
{
setName(mInfo->getName());