flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed water speed issues

Browse Source
This commit is contained in:
Tiger Wang 2013-09-12 23:31:26 +01:00
parent 8163ca9549
commit a39564a46a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/Entities/Entity.cpp
View File

@ -607,19 +607,19 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
switch(WaterDir) switch(WaterDir)
{ {
case X_PLUS: case X_PLUS:
m_WaterSpeed.x = 1.f; m_WaterSpeed.x = 0.2f;
m_bOnGround = false; m_bOnGround = false;
break; break;
case X_MINUS: case X_MINUS:
m_WaterSpeed.x = -1.f; m_WaterSpeed.x = -0.2f;
m_bOnGround = false; m_bOnGround = false;
break; break;
case Z_PLUS: case Z_PLUS:
m_WaterSpeed.z = 1.f; m_WaterSpeed.z = 0.2f;
m_bOnGround = false; m_bOnGround = false;
break; break;
case Z_MINUS: case Z_MINUS:
m_WaterSpeed.z = -1.f; m_WaterSpeed.z = -0.2f;
m_bOnGround = false; m_bOnGround = false;
break; break;
@ -650,7 +650,6 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
{ {
if( Ret == 1 ) if( Ret == 1 )
{ {
if( Tracer.HitNormal.x != 0.f ) NextSpeed.x = 0.f; if( Tracer.HitNormal.x != 0.f ) NextSpeed.x = 0.f;
if( Tracer.HitNormal.y != 0.f ) NextSpeed.y = 0.f; if( Tracer.HitNormal.y != 0.f ) NextSpeed.y = 0.f;
if( Tracer.HitNormal.z != 0.f ) NextSpeed.z = 0.f; if( Tracer.HitNormal.z != 0.f ) NextSpeed.z = 0.f;
@ -666,8 +665,10 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
NextPos.z += Tracer.HitNormal.z * 0.3f; NextPos.z += Tracer.HitNormal.z * 0.3f;
} }
else else
{
NextPos += (NextSpeed * a_Dt); NextPos += (NextSpeed * a_Dt);
} }
}
else else
{ {
// We didn't hit anything, so move =] // We didn't hit anything, so move =]