summaryrefslogtreecommitdiff
path: root/src/being.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-04-12 18:39:00 +0300
committerAndrei Karas <akaras@inbox.ru>2013-04-12 18:39:00 +0300
commit351821c1f18f9285be58df0a05339936311f6490 (patch)
tree47a60cad4f61f63c5ac2faf98dcae24760d7fe11 /src/being.cpp
parente50632a83a3c679cffd372656277a304d5d853f8 (diff)
downloadmv-351821c1f18f9285be58df0a05339936311f6490.tar.gz
mv-351821c1f18f9285be58df0a05339936311f6490.tar.bz2
mv-351821c1f18f9285be58df0a05339936311f6490.tar.xz
mv-351821c1f18f9285be58df0a05339936311f6490.zip
first part of style fixed after cpplint checks.
Diffstat (limited to 'src/being.cpp')
-rw-r--r--src/being.cpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/being.cpp b/src/being.cpp
index 9092b0750..c37550638 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -73,7 +73,7 @@ const unsigned int CACHE_SIZE = 50;
class BeingCacheEntry final
{
public:
- BeingCacheEntry(const int id):
+ explicit BeingCacheEntry(const int id):
mId(id),
mName(""),
mPartyName(""),
@@ -1075,7 +1075,6 @@ void Being::fireMissile(Being *const victim, const std::string &particle) const
missile->setDieDistance(8);
missile->setLifetime(900);
}
-
}
std::string Being::getSitAction() const
@@ -1122,7 +1121,6 @@ void Being::setAction(const Action &action, const int attackId)
}
break;
case ATTACK:
-// mAttackId = attackId;
if (mEquippedWeapon)
{
currentAction = mEquippedWeapon->getAttackAction();
@@ -1136,7 +1134,7 @@ void Being::setAction(const Action &action, const int attackId)
currentAction = mInfo->getAttack(attackId)->mAction;
reset();
- //attack particle effect
+ // attack particle effect
if (Particle::enabled)
{
const int effectId = mInfo->getAttack(attackId)->mEffectId;
@@ -1169,10 +1167,6 @@ void Being::setAction(const Action &action, const int attackId)
soundManager.playSfx(mInfo->getSound(
SOUND_EVENT_HURT), mX, mY);
}
- //currentAction = SpriteAction::HURT;// Buggy: makes the player stop
- // attacking and unable to attack
- // again until he moves.
- // TODO: fix this!
break;
case DEAD:
currentAction = SpriteAction::DEAD;
@@ -2471,7 +2465,6 @@ void Being::recalcSpritesOrder()
const int id2 = mSpriteIDs[info.mDrawAfter[dir]];
if (itemSlotRemap.find(id2) != itemSlotRemap.end())
{
-// logger->log("found duplicate (after)");
const ItemInfo &info2 = ItemDB::get(id2);
if (info.mDrawPriority[dir] < info2.mDrawPriority[dir])
{
@@ -2486,7 +2479,7 @@ void Being::recalcSpritesOrder()
}
itemSlotRemap[id] = info.mDrawAfter[dir];
-// logger->log("item slot->slot %d %d->%d", id, slot, itemSlotRemap[id]);
+// logger->log("item slot->slot %d %d->%d", id, slot, itemSlotRemap[id]);
}
}
// logger->log("preparation end");
@@ -2762,7 +2755,6 @@ void Being::setEmote(const uint8_t emotion, const int emote_time)
{
mEmotionTime = 0;
}
-
}
}