summaryrefslogtreecommitdiffstats
path: root/src/Mobs/Monster.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-08-04 12:50:57 +0200
committerMattes D <github@xoft.cz>2014-08-04 12:50:57 +0200
commitb18794d835906add37995cec4207ee4b4b0d1997 (patch)
tree93cb320e9911343f052b722278231c8b9dd79a1a /src/Mobs/Monster.cpp
parentMerge pull request #1285 from mc-server/StrCaseRefactor (diff)
parentMerge branch 'master' into Monster (diff)
downloadcuberite-b18794d835906add37995cec4207ee4b4b0d1997.tar
cuberite-b18794d835906add37995cec4207ee4b4b0d1997.tar.gz
cuberite-b18794d835906add37995cec4207ee4b4b0d1997.tar.bz2
cuberite-b18794d835906add37995cec4207ee4b4b0d1997.tar.lz
cuberite-b18794d835906add37995cec4207ee4b4b0d1997.tar.xz
cuberite-b18794d835906add37995cec4207ee4b4b0d1997.tar.zst
cuberite-b18794d835906add37995cec4207ee4b4b0d1997.zip
Diffstat (limited to '')
-rw-r--r--src/Mobs/Monster.cpp14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index 53334753a..fe8a7346f 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -290,22 +290,30 @@ void cMonster::Tick(float a_Dt, cChunk & a_Chunk)
if (m_bOnGround)
{
- Distance *= 2.5;
+ Distance *= 2.5f;
+ }
+ else if (IsSwimming())
+ {
+ Distance *= 1.3f;
}
else
{
// Don't let the mob move too much if he's falling.
- Distance *= 0.25;
+ Distance *= 0.25f;
}
AddSpeedX(Distance.x);
AddSpeedZ(Distance.z);
+ // It's too buggy!
+ /*
if (m_EMState == ESCAPING)
- { // Runs Faster when escaping :D otherwise they just walk away
+ {
+ // Runs Faster when escaping :D otherwise they just walk away
SetSpeedX (GetSpeedX() * 2.f);
SetSpeedZ (GetSpeedZ() * 2.f);
}
+ */
}
else
{