diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-06-13 19:56:05 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-06-13 19:56:05 +0300 |
commit | 38873bb99dea8a8089f1056bc1b28a59ed1f83d3 (patch) | |
tree | 702b19cf37f846f8a777777b958122d2cb562359 /src/gui | |
parent | c4d8fa788e0f89d73ba5ae2b66b79ad0351c5fbf (diff) | |
download | plus-38873bb99dea8a8089f1056bc1b28a59ed1f83d3.tar.gz plus-38873bb99dea8a8089f1056bc1b28a59ed1f83d3.tar.bz2 plus-38873bb99dea8a8089f1056bc1b28a59ed1f83d3.tar.xz plus-38873bb99dea8a8089f1056bc1b28a59ed1f83d3.zip |
Move virtual methods from Being constructor to postInit.
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/windowmanager_unittest.cc | 4 | ||||
-rw-r--r-- | src/gui/windows/charcreatedialog.cpp | 2 | ||||
-rw-r--r-- | src/gui/windows/npcdialog.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/windowmanager_unittest.cc b/src/gui/windowmanager_unittest.cc index 0928cb121..8f280036a 100644 --- a/src/gui/windowmanager_unittest.cc +++ b/src/gui/windowmanager_unittest.cc @@ -250,7 +250,7 @@ TEST_CASE("Windows tests", "windowmanager") Map *map = new Map("test map", 10, 10, 32, 32); - Being *being = new Being(BeingId_zero, + Being *being = Being::createBeing(BeingId_zero, ActorType::Avatar, id, map); @@ -404,7 +404,7 @@ TEST_CASE("Windows tests", "windowmanager") { Equipment *equipment = new Equipment; Map *map = new Map("test", 100, 100, 32, 32); - Being *being = new Being(BeingId_zero, + Being *being = Being::createBeing(BeingId_zero, ActorType::Player, BeingTypeId_zero, map); diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index 535ee956f..4d4e7b35b 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -112,7 +112,7 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent, mCreateButton(new Button(this, _("Create"), "create", this)), // TRANSLATORS: char create dialog button mCancelButton(new Button(this, _("Cancel"), "cancel", this)), - mPlayer(new Being(BeingId_zero, + mPlayer(Being::createBeing(BeingId_zero, ActorType::Player, BeingTypeId_zero, nullptr)), diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 453f35126..7b1cedfd2 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -1128,7 +1128,7 @@ void NpcDialog::showAvatar(const BeingTypeId avatarId) if (needShow) { delete mAvatarBeing; - mAvatarBeing = new Being(BeingId_zero, + mAvatarBeing = Being::createBeing(BeingId_zero, ActorType::Avatar, avatarId, nullptr); |