summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
Diffstat (limited to 'src/being')
-rw-r--r--src/being/actorsprite.h7
-rw-r--r--src/being/being.cpp12
-rw-r--r--src/being/localplayer.cpp1
3 files changed, 11 insertions, 9 deletions
diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h
index a89d605bd..7447675a1 100644
--- a/src/being/actorsprite.h
+++ b/src/being/actorsprite.h
@@ -22,10 +22,6 @@
#ifndef BEING_ACTORSPRITE_H
#define BEING_ACTORSPRITE_H
-#include "localconsts.h"
-
-#include "resources/spritedisplay.h"
-
#include "resources/map/blocktype.h"
#include "resources/map/mapconsts.h"
@@ -35,7 +31,6 @@
#include "being/targetcursorsize.h"
#include "being/targetcursortype.h"
-#include "particle/particlecontainer.h"
#include "particle/particlelist.h"
#include "particle/particlevector.h"
@@ -48,6 +43,8 @@ class AnimatedSprite;
class StatusEffect;
class ActorSpriteListener;
+struct SpriteDisplay;
+
class ActorSprite : public CompoundSprite, public Actor
{
public:
diff --git a/src/being/being.cpp b/src/being/being.cpp
index e4205a727..2fd83c7b5 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -756,8 +756,11 @@ void Being::handleAttack(Being *const victim, const int damage,
if (!weaponId)
weaponId = -100 - mSubType;
const ItemInfo &info = ItemDB::get(weaponId);
- playSfx(info.getSound((damage > 0) ?
- ItemSoundEvent::HIT : ItemSoundEvent::MISS), victim, true, mX, mY);
+ playSfx(info.getSound(
+ (damage > 0) ? ItemSoundEvent::HIT : ItemSoundEvent::MISS),
+ victim,
+ true,
+ mX, mY);
}
}
else
@@ -1209,7 +1212,10 @@ void Being::setAction(const BeingAction::Action &action, const int attackId)
currentAction = getDeadAction();
if (mInfo)
{
- playSfx(mInfo->getSound(ItemSoundEvent::DIE), this, false, mX, mY);
+ playSfx(mInfo->getSound(ItemSoundEvent::DIE),
+ this,
+ false,
+ mX, mY);
if (mType == ActorType::MONSTER || mType == ActorType::NPC)
mYDiff = mInfo->getDeadSortOffsetY();
}
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index 4e6b7615e..73c3f40ec 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -78,7 +78,6 @@
#include "resources/map/speciallayer.h"
#include "listeners/awaylistener.h"
-#include "listeners/updatestatuslistener.h"
#include "utils/delete2.h"
#include "utils/gettext.h"