summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-10-20 18:11:57 +0300
committerAndrei Karas <akaras@inbox.ru>2013-10-20 18:11:57 +0300
commit9cf563fa7f4059bfddd82efdaa89df2ed07a6d7c (patch)
tree172ff032c6d811f6f903b31413840691bd43254e /src/gui
parent13abfc42956e176c9779ee41fddc95a4b85cb389 (diff)
downloadplus-9cf563fa7f4059bfddd82efdaa89df2ed07a6d7c.tar.gz
plus-9cf563fa7f4059bfddd82efdaa89df2ed07a6d7c.tar.bz2
plus-9cf563fa7f4059bfddd82efdaa89df2ed07a6d7c.tar.xz
plus-9cf563fa7f4059bfddd82efdaa89df2ed07a6d7c.zip
Remove setMap from being constructor.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/windows/charcreatedialog.cpp3
-rw-r--r--src/gui/windows/npcdialog.cpp2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index 5164c89b6..d23a40f7a 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -121,8 +121,7 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent,
mLook(0),
mMinLook(CharDB::getMinLook()),
mMaxLook(CharDB::getMaxLook()),
- mPlayer(new Being(0, ActorSprite::PLAYER, static_cast<uint16_t>(mRace),
- nullptr)),
+ mPlayer(new Being(0, ActorSprite::PLAYER, static_cast<uint16_t>(mRace))),
mPlayerBox(new PlayerBox(mPlayer, "charcreate_playerbox.xml",
"charcreate_selectedplayerbox.xml")),
mHairStyle(0),
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index 3b5d0d772..9192b66b9 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -851,7 +851,7 @@ void NpcDialog::showAvatar(const uint16_t avatarId)
if (needShow)
{
delete mAvatarBeing;
- mAvatarBeing = new Being(0, ActorSprite::AVATAR, avatarId, nullptr);
+ mAvatarBeing = new Being(0, ActorSprite::AVATAR, avatarId);
mPlayerBox->setPlayer(mAvatarBeing);
if (!mAvatarBeing->empty())
{