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

Added helper functions AddSpeed, AddSpeedX, AddSpeedY, AddSpeedZ, AddPosition, AddPosX, AddPosY, AddPosZ. Made sure that all entites use these helper functions.

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1299 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
keyboard.osh@gmail.com
2013-03-23 04:33:47 +00:00
parent f41b33ba80
commit b32a60106f
6 changed files with 107 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/Pickup.cpp
View File

@@ -129,7 +129,7 @@ void cPickup::HandlePhysics(float a_Dt)
if( BlockIn != E_BLOCK_AIR && !IsBlockWater(BlockIn) ) // If in ground itself, push it out
{
m_bOnGround = true;
SetPosY(GetPosY() + 0.2);
AddPosY(0.2);
m_bReplicated = false;
}
SetSpeedX(GetSpeedX() * 0.7f/(1+a_Dt));
@@ -176,7 +176,7 @@ void cPickup::HandlePhysics(float a_Dt)
{
Gravity = -3;
}
SetSpeedY(GetSpeedY() + Gravity);
AddSpeedY(Gravity);
// Set to hit position
m_ResultingSpeed += GetSpeed();
@@ -209,15 +209,15 @@ void cPickup::HandlePhysics(float a_Dt)
}
}
SetPosition(Tracer.RealHit);
SetPosition(GetPosition() + (Tracer.HitNormal * 0.2f));
AddPosition(Tracer.HitNormal * 0.2f);
}
else
SetPosition(GetPosition() + (m_ResultingSpeed*a_Dt));
AddPosition(m_ResultingSpeed*a_Dt);
}
else
{ // We didn't hit anything, so move =]
SetPosition(GetPosition() + (m_ResultingSpeed*a_Dt));
AddPosition(m_ResultingSpeed*a_Dt);
}
}
// Usable for debugging