From 0af0dc0d5de485872b04b74764820654448126af Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Thu, 13 Sep 2012 11:13:05 +0200 Subject: [PATCH] Issue #356: More CreatureStats cleanup --- apps/openmw/mwmechanics/creaturestats.cpp | 46 +---------------------- apps/openmw/mwmechanics/creaturestats.hpp | 5 --- 2 files changed, 1 insertion(+), 50 deletions(-) diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp index 0d8dab0f52..91a9225fec 100644 --- a/apps/openmw/mwmechanics/creaturestats.cpp +++ b/apps/openmw/mwmechanics/creaturestats.cpp @@ -8,51 +8,7 @@ #include "../mwbase/world.hpp" namespace MWMechanics -{ - CreatureStats::CreatureStats() - {} - - // Can't use all benefits of members initialization because of - // lack of copy constructors - CreatureStats::CreatureStats(const CreatureStats &orig) - : mLevel(orig.mLevel), mHello(orig.mHello), mFight(orig.mFight), - mFlee(orig.mFlee), mAlarm(orig.mAlarm) - { - for (int i = 0; i < 8; ++i) { - mAttributes[i] = orig.mAttributes[i]; - } - for (int i = 0; i < 3; ++i) { - mDynamic[i] = orig.mDynamic[i]; - } - mSpells = orig.mSpells; - mActiveSpells = orig.mActiveSpells; - mMagicEffects = orig.mMagicEffects; - } - - CreatureStats::~CreatureStats() - {} - - const CreatureStats & - CreatureStats::operator=(const CreatureStats &orig) - { - for (int i = 0; i < 8; ++i) { - mAttributes[i] = orig.mAttributes[i]; - } - for (int i = 0; i < 3; ++i) { - mDynamic[i] = orig.mDynamic[i]; - } - mLevel = orig.mLevel; - mSpells = orig.mSpells; - mActiveSpells = orig.mActiveSpells; - mMagicEffects = orig.mMagicEffects; - mHello = orig.mHello; - mFight = orig.mFight; - mFlee = orig.mFlee; - mAlarm = orig.mAlarm; - - return *this; - } - +{ const AiSequence& CreatureStats::getAiSequence() const { return mAiSequence; diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp index d8d0f957a1..a6fb6779af 100644 --- a/apps/openmw/mwmechanics/creaturestats.hpp +++ b/apps/openmw/mwmechanics/creaturestats.hpp @@ -31,11 +31,6 @@ namespace MWMechanics AiSequence mAiSequence; public: - CreatureStats(); - CreatureStats(const CreatureStats &); - virtual ~CreatureStats(); - - const CreatureStats & operator=(const CreatureStats &); const Stat & getAttribute(int index) const;