summaryrefslogtreecommitdiff
path: root/src/being/being.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-03-05 18:33:57 +0300
committerAndrei Karas <akaras@inbox.ru>2016-03-05 18:33:57 +0300
commit1c34872aea8d196708aec8277017b467d01d09b0 (patch)
treedd14d98c40666797d1c5c14f39a5f117d17d791c /src/being/being.cpp
parent3fae3f59aad1f1f2eee1e1bfa088672787bc9c78 (diff)
downloadplus-1c34872aea8d196708aec8277017b467d01d09b0.tar.gz
plus-1c34872aea8d196708aec8277017b467d01d09b0.tar.bz2
plus-1c34872aea8d196708aec8277017b467d01d09b0.tar.xz
plus-1c34872aea8d196708aec8277017b467d01d09b0.zip
Replace in Being speed field from vector to int.
Diffstat (limited to 'src/being/being.cpp')
-rw-r--r--src/being/being.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 49fb6a480..fadf254a9 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -186,9 +186,8 @@ Being::Being(const BeingId id,
mIsGM(false),
mType(type),
mSpeechBubble(nullptr),
- mWalkSpeed(playerHandler ? playerHandler->getDefaultWalkSpeed()
- : Vector(1, 1, 1)),
- mSpeed(playerHandler ? playerHandler->getDefaultWalkSpeed().x : 0),
+ mWalkSpeed(playerHandler ? playerHandler->getDefaultWalkSpeed() : 1),
+ mSpeed(playerHandler ? playerHandler->getDefaultWalkSpeed() : 0),
mIp(),
mSpriteRemap(new int[20]),
mSpriteHide(new int[20]),
@@ -465,11 +464,11 @@ void Being::setSubtype(const BeingTypeId subtype,
if (playerHandler)
setWalkSpeed(playerHandler->getDefaultWalkSpeed());
else
- setWalkSpeed(Vector(1, 1, 0));
+ setWalkSpeed(1);
}
else
{
- setWalkSpeed(Vector(speed, speed, 0));
+ setWalkSpeed(speed);
}
}
}
@@ -1709,11 +1708,11 @@ void Being::nextTile() restrict2
if ((mType != ActorType::Player || mUseDiagonal)
&& mX != pos.x && mY != pos.y)
{
- mSpeed = static_cast<float>(mWalkSpeed.x * 1.4F);
+ mSpeed = static_cast<float>(mWalkSpeed) * 1.4F;
}
else
{
- mSpeed = mWalkSpeed.x;
+ mSpeed = static_cast<float>(mWalkSpeed);
}
if (mX != pos.x || mY != pos.y)