summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-10-06 16:37:19 +0300
committerAndrei Karas <akaras@inbox.ru>2013-10-06 16:37:19 +0300
commit7dfe062b9e33d863d23455453aae12ba592aac8b (patch)
tree62300b19a88dac0e67b2fe90fbec4eed8f93d39e /src/gui/windows
parent0f25d6e3defc9a6cd1cc2cd23b522abf8734c837 (diff)
downloadmv-7dfe062b9e33d863d23455453aae12ba592aac8b.tar.gz
mv-7dfe062b9e33d863d23455453aae12ba592aac8b.tar.bz2
mv-7dfe062b9e33d863d23455453aae12ba592aac8b.tar.xz
mv-7dfe062b9e33d863d23455453aae12ba592aac8b.zip
remove unused includes and remove default parameter in being.
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/charcreatedialog.cpp2
-rw-r--r--src/gui/windows/equipmentwindow.cpp3
-rw-r--r--src/gui/windows/npcdialog.cpp2
-rw-r--r--src/gui/windows/outfitwindow.cpp3
4 files changed, 2 insertions, 8 deletions
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index a61a6f8fd..f10f0030e 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -658,7 +658,7 @@ void CharCreateDialog::updatePlayer()
if (mPlayer)
{
mPlayer->setDirection(directions[mDirection]);
- mPlayer->setAction(actions[mAction]);
+ mPlayer->setAction(actions[mAction], 0);
}
}
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index a1dc03bac..1fe0387e4 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -41,9 +41,6 @@
#include "gui/widgets/button.h"
#include "gui/widgets/playerbox.h"
-#include "net/inventoryhandler.h"
-#include "net/net.h"
-
#include "resources/imageset.h"
#include "utils/dtor.h"
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index ea5813084..a302672f7 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -895,7 +895,7 @@ void NpcDialog::setAvatarAction(const int actionId)
{
Being *const being = mPlayerBox->getBeing();
if (being)
- being->setAction(static_cast<Being::Action>(actionId));
+ being->setAction(static_cast<Being::Action>(actionId), 0);
}
void NpcDialog::logic()
diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp
index ff1088071..54d75e726 100644
--- a/src/gui/windows/outfitwindow.cpp
+++ b/src/gui/windows/outfitwindow.cpp
@@ -44,9 +44,6 @@
#include "utils/gettext.h"
-#include "net/inventoryhandler.h"
-#include "net/net.h"
-
#include <vector>
#include "debug.h"