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

Using Super.

Browse Source
This commit is contained in:
Mattes D
2020-04-13 18:38:06 +02:00
committed by Alexander Harkness
parent f931590bf0
commit 9ee47e5999
399 changed files with 1815 additions and 1381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Entities/Boat.cpp
View File

@@ -15,7 +15,7 @@
cBoat::cBoat(Vector3d a_Pos, eMaterial a_Material) :
super(etBoat, a_Pos, 0.98, 0.7),
Super(etBoat, a_Pos, 0.98, 0.7),
m_LastDamage(0), m_ForwardDirection(0),
m_DamageTaken(0.0f), m_Material(a_Material),
m_RightPaddleUsed(false), m_LeftPaddleUsed(false)
@@ -72,7 +72,7 @@ void cBoat::BroadcastMovementUpdate(const cClientHandle * a_Exclude)
bool cBoat::DoTakeDamage(TakeDamageInfo & TDI)
{
m_LastDamage = 10;
if (!super::DoTakeDamage(TDI))
if (!Super::DoTakeDamage(TDI))
{
return false;
}
@@ -101,7 +101,7 @@ bool cBoat::DoTakeDamage(TakeDamageInfo & TDI)
void cBoat::OnRightClicked(cPlayer & a_Player)
{
super::OnRightClicked(a_Player);
Super::OnRightClicked(a_Player);
if (m_Attachee != nullptr)
{
@@ -132,7 +132,7 @@ void cBoat::OnRightClicked(cPlayer & a_Player)
void cBoat::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
{
super::Tick(a_Dt, a_Chunk);
Super::Tick(a_Dt, a_Chunk);
if (!IsTicking())
{
// The base class tick destroyed us