summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-12 19:12:15 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-12 19:12:15 +0300
commit814e88e5ca69bc54837be27429dbf42dd41f7ac6 (patch)
tree301671c06b758239f9b05b3a0e4f2774e5ab3a9e /src/gui/windows
parent261b8ab980d442d0cf1b06df244388d65f431301 (diff)
downloadplus-814e88e5ca69bc54837be27429dbf42dd41f7ac6.tar.gz
plus-814e88e5ca69bc54837be27429dbf42dd41f7ac6.tar.bz2
plus-814e88e5ca69bc54837be27429dbf42dd41f7ac6.tar.xz
plus-814e88e5ca69bc54837be27429dbf42dd41f7ac6.zip
Move being action into separate file.
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/charcreatedialog.cpp14
-rw-r--r--src/gui/windows/npcdialog.cpp2
2 files changed, 11 insertions, 5 deletions
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index b642c7f6f..72dfd21b6 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -51,15 +51,21 @@
extern int serverVersion;
-static const Being::Action actions[] =
+static const BeingAction::Action actions[] =
{
- Being::STAND, Being::SIT, Being::MOVE, Being::ATTACK, Being::DEAD
+ BeingAction::STAND,
+ BeingAction::SIT,
+ BeingAction::MOVE,
+ BeingAction::ATTACK,
+ BeingAction::DEAD
};
static const uint8_t directions[] =
{
- BeingDirection::DOWN, BeingDirection::RIGHT,
- BeingDirection::UP, BeingDirection::LEFT
+ BeingDirection::DOWN,
+ BeingDirection::RIGHT,
+ BeingDirection::UP,
+ BeingDirection::LEFT
};
CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent,
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index 56306a90f..db2800978 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -901,7 +901,7 @@ void NpcDialog::setAvatarAction(const int actionId)
{
Being *const being = mPlayerBox->getBeing();
if (being)
- being->setAction(static_cast<Being::Action>(actionId), 0);
+ being->setAction(static_cast<BeingAction::Action>(actionId), 0);
}
void NpcDialog::logic()