From 814e88e5ca69bc54837be27429dbf42dd41f7ac6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 12 May 2014 19:12:15 +0300 Subject: Move being action into separate file. --- src/gui/windows/charcreatedialog.cpp | 14 ++++++++++---- src/gui/windows/npcdialog.cpp | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'src/gui/windows') 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(actionId), 0); + being->setAction(static_cast(actionId), 0); } void NpcDialog::logic() -- cgit v1.2.3-70-g09d2