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

Small improvements to boats.

Browse Source
This commit is contained in:
STRWarrior 2014-02-24 12:58:57 +01:00
parent f77720c43f
commit 145b3492e7
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Entities/Boat.cpp
View File

@ -89,6 +89,7 @@ void cBoat::Tick(float a_Dt, cChunk & a_Chunk)
{ {
super::Tick(a_Dt, a_Chunk); super::Tick(a_Dt, a_Chunk);
BroadcastMovementUpdate(); BroadcastMovementUpdate();
SetSpeed(GetSpeed() * 0.97); // Slowly decrease the speed SetSpeed(GetSpeed() * 0.97); // Slowly decrease the speed
if ((POSY_TOINT < 0) || (POSY_TOINT > cChunkDef::Height)) if ((POSY_TOINT < 0) || (POSY_TOINT > cChunkDef::Height))
@ -98,7 +99,10 @@ void cBoat::Tick(float a_Dt, cChunk & a_Chunk)
if (IsBlockWater(m_World->GetBlock(POSX_TOINT, POSY_TOINT, POSZ_TOINT))) if (IsBlockWater(m_World->GetBlock(POSX_TOINT, POSY_TOINT, POSZ_TOINT)))
{ {
SetSpeedY(1); if (GetSpeedY() < 2)
{
AddSpeedY(0.2);
}
} }
} }
@ -108,12 +112,12 @@ void cBoat::Tick(float a_Dt, cChunk & a_Chunk)
void cBoat::HandleSpeedFromAttachee(float a_Forward, float a_Sideways) void cBoat::HandleSpeedFromAttachee(float a_Forward, float a_Sideways)
{ {
if (GetSpeed().Length() > 7) if (GetSpeed().Length() > 7.5)
{ {
return; return;
} }
Vector3d ToAddSpeed(m_Attachee->GetLookVector() * (a_Sideways * 1.5)); Vector3d ToAddSpeed = m_Attachee->GetLookVector() * (a_Sideways * 0.4) ;
ToAddSpeed.y = 0; ToAddSpeed.y = 0;
AddSpeed(ToAddSpeed); AddSpeed(ToAddSpeed);