summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-10-28 14:30:31 +0300
committerAndrei Karas <akaras@inbox.ru>2013-10-28 14:30:31 +0300
commit462867b1d99cf63a27566449cbf8f0feda7f1ec6 (patch)
tree3d4a159827bc5af72a2c5aedc89698fee44033c2 /src/gui
parentbc27e1bc29ab07a8560db30355ca3aeb3cfb724f (diff)
downloadplus-462867b1d99cf63a27566449cbf8f0feda7f1ec6.tar.gz
plus-462867b1d99cf63a27566449cbf8f0feda7f1ec6.tar.bz2
plus-462867b1d99cf63a27566449cbf8f0feda7f1ec6.tar.xz
plus-462867b1d99cf63a27566449cbf8f0feda7f1ec6.zip
Revert "Remove setMap from being constructor."
This reverts commit 9cf563fa7f4059bfddd82efdaa89df2ed07a6d7c.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/windows/charcreatedialog.cpp3
-rw-r--r--src/gui/windows/npcdialog.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index d23a40f7a..5164c89b6 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -121,7 +121,8 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent,
mLook(0),
mMinLook(CharDB::getMinLook()),
mMaxLook(CharDB::getMaxLook()),
- mPlayer(new Being(0, ActorSprite::PLAYER, static_cast<uint16_t>(mRace))),
+ mPlayer(new Being(0, ActorSprite::PLAYER, static_cast<uint16_t>(mRace),
+ nullptr)),
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 9192b66b9..3b5d0d772 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);
+ mAvatarBeing = new Being(0, ActorSprite::AVATAR, avatarId, nullptr);
mPlayerBox->setPlayer(mAvatarBeing);
if (!mAvatarBeing->empty())
{