From 71ed8b67e2988e4452dde73643e8b609dc0a64cf Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 28 Jul 2013 20:04:48 +0300 Subject: move bools in localplayer. --- src/localplayer.cpp | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'src/localplayer.cpp') diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 9342b6541..820295570 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -94,7 +94,6 @@ extern SkillDialog *skillDialog; LocalPlayer::LocalPlayer(const int id, const int subtype) : Being(id, PLAYER, subtype, nullptr), - mUpdateName(true), mGMLevel(0), mInvertDirection(0), mCrazyMoveType(config.getIntValue("crazyMoveType")), @@ -102,7 +101,6 @@ LocalPlayer::LocalPlayer(const int id, const int subtype) : mAttackWeaponType(config.getIntValue("attackWeaponType")), mQuickDropCounter(config.getIntValue("quickDropCounter")), mMoveState(0), - mDisableCrazyMove(false), mPickUpType(config.getIntValue("pickUpType")), mMagicAttackType(config.getIntValue("magicAttackType")), mPvpAttackType(config.getIntValue("pvpAttackType")), @@ -110,7 +108,6 @@ LocalPlayer::LocalPlayer(const int id, const int subtype) : mAttackType(config.getIntValue("attackType")), mFollowMode(config.getIntValue("followMode")), mImitationMode(config.getIntValue("imitationMode")), - mDisableGameModifiers(config.getBoolValue("disableGameModifiers")), mLastTargetX(0), mLastTargetY(0), mHomes(), @@ -120,11 +117,7 @@ LocalPlayer::LocalPlayer(const int id, const int subtype) : mNextDestX(0), mNextDestY(0), mPickUpTarget(nullptr), - mGoingToTarget(false), - mKeepAttacking(false), mLastAction(-1), - mWalkingDir(0), - mPathSetByMouse(false), mStatusEffectIcons(), mLocalWalkTime(-1), mMessages(), @@ -132,18 +125,8 @@ LocalPlayer::LocalPlayer(const int id, const int subtype) : mAwayListener(new AwayListener), mAwayDialog(nullptr), mPingSendTick(0), - mWaitPing(false), mPingTime(0), mAfkTime(0), - mAwayMode(false), - mPseudoAwayMode(false), - mShowNavigePath(false), - mIsServerBuggy(serverConfig.getValueBool("enableBuggyServers", true)), - mSyncPlayerMove(config.getBoolValue("syncPlayerMove")), - mDrawPath(config.getBoolValue("drawPath")), - mAttackMoving(config.getBoolValue("attackMoving")), - mAttackNext(config.getBoolValue("attackNext")), - mShowJobExp(config.getBoolValue("showJobExp")), mActivityTime(0), mNavigateX(0), mNavigateY(0), @@ -155,8 +138,6 @@ LocalPlayer::LocalPlayer(const int id, const int subtype) : mOldTileX(0), mOldTileY(0), mNavigatePath(), - mTargetDeadPlayers(config.getBoolValue("targetDeadPlayers")), - mServerAttack(config.getBoolValue("serverAttack")), mLastHitFrom(), mWaitFor(), mAdvertTime(0), @@ -164,11 +145,30 @@ LocalPlayer::LocalPlayer(const int id, const int subtype) : mTestParticleName(), mTestParticleTime(0), mTestParticleHash(0l), + mWalkingDir(0), + mUpdateName(true), mBlockAdvert(false), + mTargetDeadPlayers(config.getBoolValue("targetDeadPlayers")), + mServerAttack(config.getBoolValue("serverAttack")), mEnableAdvert(config.getBoolValue("enableAdvert")), mTradebot(config.getBoolValue("tradebot")), mTargetOnlyReachable(config.getBoolValue("targetOnlyReachable")), - mNextStep(false) + mDisableGameModifiers(config.getBoolValue("disableGameModifiers")), + mIsServerBuggy(serverConfig.getValueBool("enableBuggyServers", true)), + mSyncPlayerMove(config.getBoolValue("syncPlayerMove")), + mDrawPath(config.getBoolValue("drawPath")), + mAttackMoving(config.getBoolValue("attackMoving")), + mAttackNext(config.getBoolValue("attackNext")), + mShowJobExp(config.getBoolValue("showJobExp")), + mNextStep(false), + mDisableCrazyMove(false), + mGoingToTarget(false), + mKeepAttacking(false), + mPathSetByMouse(false), + mWaitPing(false), + mAwayMode(false), + mPseudoAwayMode(false), + mShowNavigePath(false) { logger->log1("LocalPlayer::LocalPlayer"); -- cgit v1.2.3-60-g2f50