summaryrefslogtreecommitdiff
path: root/src/gui
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/gui
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/gui')
-rw-r--r--src/gui/popups/popupmenu.cpp3
-rw-r--r--src/gui/windows/npcdialog.cpp6
-rw-r--r--src/gui/windows/npcdialog.h3
3 files changed, 7 insertions, 5 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index ee34d4ff7..59c1cc469 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -389,7 +389,8 @@ bool PopupMenu::addBeingMenu()
if (!being)
return false;
- BeingInfo *const info = NPCDB::get(fromInt(being->getSubType(), BeingId));
+ BeingInfo *const info = NPCDB::get(fromInt(
+ being->getSubType(), BeingTypeId));
if (!info)
return false;
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index c8ccd482e..c60cbd9b4 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -205,7 +205,7 @@ void NpcDialog::postInit()
if (being)
{
showAvatar(NPCDB::getAvatarFor(fromInt(
- being->getSubType(), BeingId)));
+ being->getSubType(), BeingTypeId)));
setCaption(being->getName());
}
}
@@ -862,9 +862,9 @@ void NpcDialog::restoreCamera()
mCameraMode = -1;
}
-void NpcDialog::showAvatar(const BeingId avatarId)
+void NpcDialog::showAvatar(const BeingTypeId avatarId)
{
- const bool needShow = (avatarId != BeingId_zero);
+ const bool needShow = (avatarId != BeingTypeId_zero);
if (needShow)
{
delete mAvatarBeing;
diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h
index 378bbd5e9..5d6786255 100644
--- a/src/gui/windows/npcdialog.h
+++ b/src/gui/windows/npcdialog.h
@@ -24,6 +24,7 @@
#define GUI_WINDOWS_NPCDIALOG_H
#include "enums/simpletypes/beingid.h"
+#include "enums/simpletypes/beingtypeid.h"
#include "enums/simpletypes/visible.h"
#include "gui/models/extendedlistmodel.h"
@@ -197,7 +198,7 @@ class NpcDialog final : public Window,
void refocus();
- void showAvatar(const BeingId avatarId);
+ void showAvatar(const BeingTypeId avatarId);
void setAvatarDirection(const uint8_t direction);