From 462867b1d99cf63a27566449cbf8f0feda7f1ec6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 28 Oct 2013 14:30:31 +0300 Subject: Revert "Remove setMap from being constructor." This reverts commit 9cf563fa7f4059bfddd82efdaa89df2ed07a6d7c. --- src/gui/windows/charcreatedialog.cpp | 3 ++- src/gui/windows/npcdialog.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/gui/windows') 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(mRace))), + mPlayer(new Being(0, ActorSprite::PLAYER, static_cast(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()) { -- cgit v1.2.3-70-g09d2