summaryrefslogtreecommitdiff
path: root/src/being.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-07-28 22:21:17 +0300
committerAndrei Karas <akaras@inbox.ru>2013-07-28 22:21:17 +0300
commit74ecebf0f30c3d13368c33cdae9b8952966d8c8b (patch)
tree2411d62f1244d20eb23d247af63a0b13177dcecd /src/being.cpp
parent3105ca8c138874170514ef53198ca1ad3d119add (diff)
downloadmanaplus-74ecebf0f30c3d13368c33cdae9b8952966d8c8b.tar.gz
manaplus-74ecebf0f30c3d13368c33cdae9b8952966d8c8b.tar.bz2
manaplus-74ecebf0f30c3d13368c33cdae9b8952966d8c8b.tar.xz
manaplus-74ecebf0f30c3d13368c33cdae9b8952966d8c8b.zip
move bools in being.
Diffstat (limited to 'src/being.cpp')
-rw-r--r--src/being.cpp58
1 files changed, 29 insertions, 29 deletions
diff --git a/src/being.cpp b/src/being.cpp
index 0c3e1160b..2087b6e0b 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -98,43 +98,50 @@ Being::Being(const int id, const Type type, const uint16_t subtype,
ActorSprite(id),
mNextSound(),
mInfo(BeingInfo::unknown),
- mActionTime(0),
mEmotionSprite(nullptr),
- mEmotionTime(0),
- mSpeechTime(0),
mAnimationEffect(nullptr),
- mAttackSpeed(350),
- mAction(STAND),
- mSubType(0xFFFF),
- mDirection(DOWN),
- mDirectionDelayed(0),
- mSpriteDirection(DIRECTION_DOWN),
mSpriteAction(SpriteAction::STAND),
mName(),
mRaceName(),
mPartyName(),
mGuildName(),
+ mSpeech(),
mDispName(nullptr),
mNameColor(nullptr),
- mShowName(false),
mEquippedWeapon(nullptr),
mPath(),
- mSpeech(),
mText(nullptr),
mTextColor(nullptr),
- mLevel(0),
mDest(),
- mSpriteIDs(),
mSpriteColors(),
+ mSpriteIDs(),
mSpriteColorsIds(),
- mGender(GENDER_UNSPECIFIED),
mGuilds(),
mParty(nullptr),
- mIsGM(false),
+ mActionTime(0),
+ mEmotionTime(0),
+ mSpeechTime(0),
+ mAttackSpeed(350),
+ mLevel(0),
mAttackRange(1),
+ mGender(GENDER_UNSPECIFIED),
+ mAction(STAND),
+ mSubType(0xFFFF),
+ mDirection(DOWN),
+ mDirectionDelayed(0),
+ mSpriteDirection(DIRECTION_DOWN),
+ mShowName(false),
+ mIsGM(false),
mType(type),
mSpeechBubble(new SpeechBubble),
mWalkSpeed(Net::getPlayerHandler()->getDefaultWalkSpeed()),
+ mIp(),
+ mSpriteRemap(new int[20]),
+ mSpriteHide(new int[20]),
+ mComment(),
+ mPet(nullptr),
+ mOwner(nullptr),
+ mSpecialParticle(nullptr),
mX(0),
mY(0),
mDamageTaken(0),
@@ -148,29 +155,22 @@ Being::Being(const int id, const Type type, const uint16_t subtype,
mTalkTime(0),
mOtherTime(0),
mTestTime(cur_time),
- mErased(false),
- mEnemy(false),
- mIp(""),
mAttackDelay(0),
mMinHit(0),
mMaxHit(0),
mCriticalHit(0),
mPvpRank(0),
- mSpriteRemap(new int[20]),
- mSpriteHide(new int[20]),
- mComment(""),
+ mNumber(100),
+ mPetId(0),
+ mLook(0),
+ mHairColor(0),
+ mErased(false),
+ mEnemy(false),
mGotComment(false),
mAdvanced(false),
mShop(false),
mAway(false),
- mInactive(false),
- mNumber(100),
- mHairColor(0),
- mPet(nullptr),
- mPetId(0),
- mLook(0),
- mOwner(nullptr),
- mSpecialParticle(nullptr)
+ mInactive(false)
{
for (int f = 0; f < 20; f ++)
{