summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-03-26 00:10:52 +0300
committerAndrei Karas <akaras@inbox.ru>2016-03-26 13:53:30 +0300
commit35d6f9c1086d84a479bab84f07f8c9dae266f4ca (patch)
tree632b84779ac9b9ce20b60f99272f4a4c241b0b74 /src/being
parent6e71645ebfd4cf07d86bd913b0002a3a1a33c1a9 (diff)
downloadmv-35d6f9c1086d84a479bab84f07f8c9dae266f4ca.tar.gz
mv-35d6f9c1086d84a479bab84f07f8c9dae266f4ca.tar.bz2
mv-35d6f9c1086d84a479bab84f07f8c9dae266f4ca.tar.xz
mv-35d6f9c1086d84a479bab84f07f8c9dae266f4ca.zip
Fix code style.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/actorsprite.cpp2
-rw-r--r--src/being/being.cpp4
-rw-r--r--src/being/being.h2
-rw-r--r--src/being/localplayer.cpp2
-rw-r--r--src/being/playerinfo.cpp2
5 files changed, 5 insertions, 7 deletions
diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp
index 7004743c1..ec5d7b6a2 100644
--- a/src/being/actorsprite.cpp
+++ b/src/being/actorsprite.cpp
@@ -33,7 +33,7 @@
#include "listeners/debugmessagelistener.h"
-#include "particle/particle.h"
+#include "particle/particleengine.h"
#include "resources/resourcemanager.h"
diff --git a/src/being/being.cpp b/src/being/being.cpp
index b24f10ecd..57529b734 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -1837,7 +1837,8 @@ void Being::logic() restrict2
mNeedPosUpdate = false;
const int halfTile = mapTileSize / 2;
- const float offset2 = static_cast<float>(mPixelOffsetY * abs(offset)) / 2;
+ const float offset2 = static_cast<float>(
+ mPixelOffsetY * abs(offset)) / 2;
// mSortOffsetY = (mOldHeight - mFixedOffsetY + mPixelOffsetY)
// * halfTile - offset2;
mSortOffsetY = 0;
@@ -3136,7 +3137,6 @@ void Being::drawMonsterSpriteAt(Graphics *restrict const graphics,
2 * 50,
4);
}
-
}
void Being::drawPortalSpriteAt(Graphics *restrict const graphics,
diff --git a/src/being/being.h b/src/being/being.h
index 23c7fd7e0..606db0a35 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -1170,7 +1170,7 @@ class Being notfinal : public ActorSprite,
int mX; // position in tiles
int mY; // position in tiles
- int mSortOffsetY; // caculated offset in pixels based on mPixelOffsetY
+ int mSortOffsetY; // caculated offset in pixels based on mPixelOffsetY
int mPixelOffsetY; // tile height offset in pixels
// calculated between tiles
int mFixedOffsetY; // fixed tile height offset in pixels for tile
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index bd03cbf96..17aa4e2e3 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -42,7 +42,7 @@
#include "enums/resources/map/mapitemtype.h"
-#include "particle/particle.h"
+#include "particle/particleengine.h"
#include "input/keyboardconfig.h"
diff --git a/src/being/playerinfo.cpp b/src/being/playerinfo.cpp
index 2d8f21056..68b3ee8e1 100644
--- a/src/being/playerinfo.cpp
+++ b/src/being/playerinfo.cpp
@@ -30,8 +30,6 @@
#include "being/homunculusinfo.h"
#include "being/mercenaryinfo.h"
#include "being/petinfo.h"
-
-#include "enums/resources/itemdbtype.h"
#endif
#include "gui/windows/inventorywindow.h"