summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-09-09 19:41:31 +0300
committerAndrei Karas <akaras@inbox.ru>2016-09-09 19:41:31 +0300
commit97943710d847ddb2b52099330f1961bda127e37b (patch)
treeab2522aab524c3393a6dd4f1d51811d3eac9984e /src/being
parent22d0a32e03656262a7a5cccb3769aed59bfe0a5b (diff)
downloadmv-97943710d847ddb2b52099330f1961bda127e37b.tar.gz
mv-97943710d847ddb2b52099330f1961bda127e37b.tar.bz2
mv-97943710d847ddb2b52099330f1961bda127e37b.tar.xz
mv-97943710d847ddb2b52099330f1961bda127e37b.zip
Fix code style.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/beingcacheentry.h6
-rw-r--r--src/being/flooritem.cpp4
-rw-r--r--src/being/flooritem.h2
-rw-r--r--src/being/localplayer.cpp2
-rw-r--r--src/being/localplayer.h2
5 files changed, 8 insertions, 8 deletions
diff --git a/src/being/beingcacheentry.h b/src/being/beingcacheentry.h
index 4da40f2c2..c1a45120a 100644
--- a/src/being/beingcacheentry.h
+++ b/src/being/beingcacheentry.h
@@ -85,10 +85,10 @@ class BeingCacheEntry final
int getLevel() const
{ return mLevel; }
- void setTime(const int n)
+ void setTime(const time_t n)
{ mTime = n; }
- int getTime() const
+ time_t getTime() const
{ return mTime; }
unsigned getPvpRank() const
@@ -129,7 +129,7 @@ class BeingCacheEntry final
BeingId mId; /**< Unique sprite id */
int mLevel;
unsigned int mPvpRank;
- int mTime;
+ time_t mTime;
int mFlags;
uint16_t mTeamId;
bool mIsAdvanced;
diff --git a/src/being/flooritem.cpp b/src/being/flooritem.cpp
index 83857d043..586fb044a 100644
--- a/src/being/flooritem.cpp
+++ b/src/being/flooritem.cpp
@@ -178,14 +178,14 @@ void FloorItem::draw(Graphics *const graphics,
&& curTime < mDropTime + 28)
{
graphics->setColor(Color(200, 80, 20,
- 80 + 10 * (curTime - mDropTime - 18)));
+ 80 + 10 * CAST_S32(curTime - mDropTime - 18)));
graphics->fillRectangle(Rect(
x, y, dx, dy));
}
else if (curTime > mDropTime && curTime < mDropTime + 20)
{
graphics->setColor(Color(20, 20, 255,
- 7 * (curTime - mDropTime)));
+ 7 * CAST_S32(curTime - mDropTime)));
graphics->fillRectangle(Rect(x, y, dx, dy));
}
}
diff --git a/src/being/flooritem.h b/src/being/flooritem.h
index 60e5d953d..23c32f446 100644
--- a/src/being/flooritem.h
+++ b/src/being/flooritem.h
@@ -136,7 +136,7 @@ class FloorItem final : public ActorSprite
int mCards[maxCards];
int mItemId;
int mX, mY;
- int mDropTime;
+ time_t mDropTime;
int mAmount;
int mRefine;
int mHeightPosDiff;
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index 2766a31b1..007a3d88e 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -287,7 +287,7 @@ void LocalPlayer::logic()
{
if (mMessageTime == 0)
{
- MessagePair info = mMessages.front();
+ const MessagePair info = mMessages.front();
if (particleEngine && gui)
{
diff --git a/src/being/localplayer.h b/src/being/localplayer.h
index a3d4814e5..d74481298 100644
--- a/src/being/localplayer.h
+++ b/src/being/localplayer.h
@@ -500,7 +500,7 @@ class LocalPlayer final : public Being,
std::string mLastHitFrom;
std::string mWaitFor;
- int mAdvertTime;
+ time_t mAdvertTime;
Particle *mTestParticle;
std::string mTestParticleName;
time_t mTestParticleTime;