From 38873bb99dea8a8089f1056bc1b28a59ed1f83d3 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 13 Jun 2017 19:56:05 +0300 Subject: Move virtual methods from Being constructor to postInit. --- src/being/being.cpp | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'src/being/being.cpp') diff --git a/src/being/being.cpp b/src/being/being.cpp index 97492d431..e954a5e97 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -156,9 +156,7 @@ static const unsigned int SPEECH_MAX_TIME = 800; FOR_EACH (std::vector::const_iterator, it, name) Being::Being(const BeingId id, - const ActorTypeT type, - const BeingTypeId subtype, - Map *const map) : + const ActorTypeT type) : ActorSprite(id), mNextSound(), mInfo(BeingInfo::unknown), @@ -277,7 +275,11 @@ Being::Being(const BeingId id, for_each_badges() mBadges[f] = nullptr; +} +void Being::postInit(const BeingTypeId subtype, + Map *const map) +{ setMap(map); setSubtype(subtype, 0); @@ -5359,3 +5361,15 @@ void Being::setLanguageId(const int lang) restrict2 noexcept2 mLanguageId = lang; } } + +Being *Being::createBeing(const BeingId id, + const ActorTypeT type, + const BeingTypeId subType, + Map *const map) +{ + Being *const being = new Being(id, + type); + being->postInit(subType, + map); + return being; +} -- cgit v1.2.3-70-g09d2