From 7dfe062b9e33d863d23455453aae12ba592aac8b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 6 Oct 2013 16:37:19 +0300 Subject: remove unused includes and remove default parameter in being. --- src/being/being.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/being/being.cpp') diff --git a/src/being/being.cpp b/src/being/being.cpp index 3bf1c4453..94e94161e 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -742,7 +742,7 @@ void Being::handleAttack(Being *const victim, const int damage, setDirection(dir); } if (damage && victim->mType == PLAYER && victim->mAction == SIT) - victim->setAction(STAND); + victim->setAction(STAND, 0); if (mType == PLAYER) { @@ -795,7 +795,7 @@ void Being::handleSkill(Being *const victim, const int damage, setDirection(dir); } if (damage && victim->mType == PLAYER && victim->mAction == SIT) - victim->setAction(STAND); + victim->setAction(STAND, 0); if (data) { if (damage > 0) @@ -1337,7 +1337,7 @@ void Being::nextTile() { if (mPath.empty()) { - setAction(STAND); + setAction(STAND, 0); return; } @@ -1350,7 +1350,7 @@ void Being::nextTile() if (!mMap || !mMap->getWalk(pos.x, pos.y, getWalkMask())) { - setAction(STAND); + setAction(STAND, 0); return; } @@ -1366,7 +1366,7 @@ void Being::nextTile() mY = pos.y; const uint8_t height = mMap->getHeightOffset(mX, mY); mOffsetY = height - mOldHeight; - setAction(MOVE); + setAction(MOVE, 0); } void Being::logic() @@ -1446,7 +1446,7 @@ void Being::logic() } if (mAction != MOVE) - setAction(MOVE); + setAction(MOVE, 0); // Update the player sprite direction. // N.B.: We only change this if the distance is more than one pixel. @@ -1480,7 +1480,7 @@ void Being::logic() } else if (mAction == MOVE) { - setAction(STAND); + setAction(STAND, 0); } } else @@ -1962,7 +1962,7 @@ void Being::setSprite(const unsigned int slot, const int id, if (isWeapon) mEquippedWeapon = &ItemDB::get(id); - setAction(mAction); + setAction(mAction, 0); } if (!isTempSprite) @@ -2899,7 +2899,7 @@ void Being::updatePercentHP() { mNumber = num; if (updateNumber(mNumber)) - setAction(mAction); + setAction(mAction, 0); } } } -- cgit v1.2.3-70-g09d2