diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-05-21 12:28:40 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-05-21 20:26:12 +0300 |
| commit | f4fe732ccbd65fd584b7787f3b5aec904a85d11b (patch) | |
| tree | 5cf6023ab3713316326547026c10f2fb4ce6d8b8 /src/being | |
| parent | c78423448941517eeae0a60e703a5dc2976aed0c (diff) | |
| download | manaverse-f4fe732ccbd65fd584b7787f3b5aec904a85d11b.tar.gz manaverse-f4fe732ccbd65fd584b7787f3b5aec904a85d11b.tar.bz2 manaverse-f4fe732ccbd65fd584b7787f3b5aec904a85d11b.tar.xz manaverse-f4fe732ccbd65fd584b7787f3b5aec904a85d11b.zip | |
Fix code style.
Diffstat (limited to 'src/being')
| -rw-r--r-- | src/being/being.cpp | 7 | ||||
| -rw-r--r-- | src/being/localplayer.cpp | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp index 2fd83c7b5..adc1313a0 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -82,6 +82,7 @@ #include "gui/widgets/tabs/langtab.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include "utils/timer.h" @@ -597,7 +598,11 @@ void Being::takeDamage(Being *const attacker, const int amount, mDamageTaken += amount; if (mInfo) { - playSfx(mInfo->getSound(ItemSoundEvent::HURT), this, false, mX, mY); + playSfx(mInfo->getSound(ItemSoundEvent::HURT), + this, + false, + mX, + mY); if (!mInfo->isStaticMaxHP()) { diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index 73c3f40ec..ddc29629e 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -904,7 +904,8 @@ int LocalPlayer::getAttackRange() const } else { - const Item *const weapon = PlayerInfo::getEquipment(ItemSlot::FIGHT1_SLOT); + const Item *const weapon = PlayerInfo::getEquipment( + ItemSlot::FIGHT1_SLOT); if (weapon) { const ItemInfo &info = weapon->getInfo(); @@ -3592,7 +3593,8 @@ void LocalPlayer::setRealPos(const int x, const int y) if ((mCrossX || mCrossY) && layer->getTile(mCrossX, mCrossY) - && layer->getTile(mCrossX, mCrossY)->getType() == MapItemType::CROSS) + && layer->getTile(mCrossX, mCrossY)->getType() + == MapItemType::CROSS) { layer->setTile(mCrossX, mCrossY, MapItemType::EMPTY); } |