diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 22:30:00 +0100 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2009-02-09 17:10:37 -0700 |
| commit | 1db7d10787f462430054ba04110a8d4647bdbd0a (patch) | |
| tree | 60dc4d04c738b1f54a41bc9d9b6d0e5ffb0fb1d4 /src/localplayer.cpp | |
| parent | 1ae95b709235ce811ce72437aa257bb7500e00d0 (diff) | |
| download | mana-1db7d10787f462430054ba04110a8d4647bdbd0a.tar.gz mana-1db7d10787f462430054ba04110a8d4647bdbd0a.tar.bz2 mana-1db7d10787f462430054ba04110a8d4647bdbd0a.tar.xz mana-1db7d10787f462430054ba04110a8d4647bdbd0a.zip | |
Mostly whitespace fixes
Removed tab characters and trailing spaces and added spaces between
"if(", "for(", "while(" and "switch(".
Diffstat (limited to 'src/localplayer.cpp')
| -rw-r--r-- | src/localplayer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 01de3b41..d047cc80 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -72,7 +72,7 @@ LocalPlayer::LocalPlayer(Uint32 id, Uint16 job, Map *map): mTarget(NULL), mPickUpTarget(NULL), mTrading(false), mGoingToTarget(false), mTargetTime(-1), mLastAction(-1), - mLastTarget(-1), mWalkingDir(0), + mLastTarget(-1), mWalkingDir(0), mDestX(0), mDestY(0), mInventory(new Inventory(INVENTORY_SIZE)), mStorage(new Inventory(STORAGE_SIZE)) @@ -176,7 +176,7 @@ void LocalPlayer::logic() } void LocalPlayer::setGM() -{ +{ mIsGM = !mIsGM; mNameColor = mIsGM ? 0x009000: 0x202020; setName(getName()); @@ -509,7 +509,7 @@ void LocalPlayer::attack(Being *target, bool keep) int dist_y = target->mY - mY; // Must be standing and be within attack range to continue - if ((mAction != STAND) || (mAttackRange < abs(dist_x)) || + if ((mAction != STAND) || (mAttackRange < abs(dist_x)) || (mAttackRange < abs(dist_y))) return; @@ -654,7 +654,7 @@ void LocalPlayer::loadTargetCursor(std::string filename, int width, int height, mOutRangeImages[size] = currentImageSet; mTargetCursorOutRange[size] = currentCursor; } - else + else { mInRangeImages[size] = currentImageSet; mTargetCursorInRange[size] = currentCursor; @@ -681,7 +681,7 @@ void LocalPlayer::drawTargetCursor(Graphics *graphics, int scrollX, int scrollY) { mTarget->mTargetCursor = mTargetCursorOutRange[cursorSize]->getCurrentImage(); } - else + else { mTarget->mTargetCursor = mTargetCursorInRange[cursorSize]->getCurrentImage(); } |