From b32a60106f78971da034a457cd091c7e69c5aec8 Mon Sep 17 00:00:00 2001 From: "keyboard.osh@gmail.com" Date: Sat, 23 Mar 2013 04:33:47 +0000 Subject: Added helper functions AddSpeed, AddSpeedX, AddSpeedY, AddSpeedZ, AddPosition, AddPosX, AddPosY, AddPosZ. Made sure that all entites use these helper functions. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1299 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Pickup.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source/Pickup.cpp') diff --git a/source/Pickup.cpp b/source/Pickup.cpp index 5775782f5..16e68b3ee 100644 --- a/source/Pickup.cpp +++ b/source/Pickup.cpp @@ -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 -- cgit v1.2.3