Fixed ToLua errors, added newlines
This commit is contained in:
parent
cc39d314ae
commit
15324f3bbd
@ -190,4 +190,4 @@ void cArrowEntity::Tick(float a_Dt, cChunk & a_Chunk)
|
|||||||
m_IsInGround = false; // Yes, begin simulating physics again
|
m_IsInGround = false; // Yes, begin simulating physics again
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -93,4 +93,4 @@ protected:
|
|||||||
virtual void CollectedBy(cPlayer * a_Player) override;
|
virtual void CollectedBy(cPlayer * a_Player) override;
|
||||||
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
|
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
|
||||||
|
|
||||||
};
|
}; // tolua_export
|
||||||
|
@ -56,4 +56,4 @@ void cThrownEggEntity::TrySpawnChicken(const Vector3d & a_HitPos)
|
|||||||
m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken);
|
m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken);
|
||||||
m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken);
|
m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -34,4 +34,4 @@ protected:
|
|||||||
// Randomly decides whether to spawn a chicken where the egg lands.
|
// Randomly decides whether to spawn a chicken where the egg lands.
|
||||||
void TrySpawnChicken(const Vector3d & a_HitPos);
|
void TrySpawnChicken(const Vector3d & a_HitPos);
|
||||||
|
|
||||||
} ;
|
} ; // tolua_export
|
||||||
|
@ -51,4 +51,4 @@ void cThrownEnderPearlEntity::TeleportCreator(const Vector3d & a_HitPos)
|
|||||||
m_Creator->TeleportToCoords(a_HitPos.x + 0.5, a_HitPos.y + 1.7, a_HitPos.z + 0.5);
|
m_Creator->TeleportToCoords(a_HitPos.x + 0.5, a_HitPos.y + 1.7, a_HitPos.z + 0.5);
|
||||||
m_Creator->TakeDamage(dtEnderPearl, this, 5, 0);
|
m_Creator->TakeDamage(dtEnderPearl, this, 5, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -34,4 +34,4 @@ protected:
|
|||||||
// Teleports the creator where the ender pearl lands.
|
// Teleports the creator where the ender pearl lands.
|
||||||
void TeleportCreator(const Vector3d & a_HitPos);
|
void TeleportCreator(const Vector3d & a_HitPos);
|
||||||
|
|
||||||
} ;
|
} ; // tolua_export
|
||||||
|
@ -409,4 +409,4 @@ void cProjectileEntity::CollectedBy(cPlayer * a_Dest)
|
|||||||
{
|
{
|
||||||
// Overriden in arrow
|
// Overriden in arrow
|
||||||
UNUSED(a_Dest);
|
UNUSED(a_Dest);
|
||||||
}
|
}
|
||||||
|
@ -94,4 +94,4 @@ protected:
|
|||||||
virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) override;
|
virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) override;
|
||||||
virtual void SpawnOn(cClientHandle & a_Client) override;
|
virtual void SpawnOn(cClientHandle & a_Client) override;
|
||||||
|
|
||||||
} ;
|
} ; // tolua_export
|
||||||
|
@ -24,4 +24,4 @@ void cExpBottleEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_H
|
|||||||
m_World->SpawnExperienceOrb(GetPosX(), GetPosY(), GetPosZ(), 3 + m_World->GetTickRandomNumber(8));
|
m_World->SpawnExperienceOrb(GetPosX(), GetPosY(), GetPosZ(), 3 + m_World->GetTickRandomNumber(8));
|
||||||
|
|
||||||
Destroy();
|
Destroy();
|
||||||
}
|
}
|
||||||
|
@ -30,4 +30,4 @@ protected:
|
|||||||
// cProjectileEntity overrides:
|
// cProjectileEntity overrides:
|
||||||
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
|
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
|
||||||
|
|
||||||
};
|
}; // tolua_export
|
||||||
|
@ -47,4 +47,4 @@ void cFireChargeEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_Hi
|
|||||||
|
|
||||||
// TODO: Some entities are immune to hits
|
// TODO: Some entities are immune to hits
|
||||||
a_EntityHit.StartBurning(5 * 20); // 5 seconds of burning
|
a_EntityHit.StartBurning(5 * 20); // 5 seconds of burning
|
||||||
}
|
}
|
||||||
|
@ -33,4 +33,4 @@ protected:
|
|||||||
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
|
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
|
||||||
virtual void OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
|
virtual void OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
|
||||||
|
|
||||||
} ;
|
} ; // tolua_export
|
||||||
|
@ -70,4 +70,4 @@ void cFireworkEntity::Tick(float a_Dt, cChunk & a_Chunk)
|
|||||||
}
|
}
|
||||||
|
|
||||||
m_ExplodeTimer++;
|
m_ExplodeTimer++;
|
||||||
}
|
}
|
||||||
|
@ -37,4 +37,4 @@ private:
|
|||||||
int m_ExplodeTimer;
|
int m_ExplodeTimer;
|
||||||
cItem m_FireworkItem;
|
cItem m_FireworkItem;
|
||||||
|
|
||||||
};
|
}; // tolua_export
|
||||||
|
@ -41,4 +41,4 @@ void cGhastFireballEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a
|
|||||||
{
|
{
|
||||||
Destroy();
|
Destroy();
|
||||||
Explode((int)floor(a_HitPos.x), (int)floor(a_HitPos.y), (int)floor(a_HitPos.z));
|
Explode((int)floor(a_HitPos.x), (int)floor(a_HitPos.y), (int)floor(a_HitPos.z));
|
||||||
}
|
}
|
||||||
|
@ -35,4 +35,4 @@ protected:
|
|||||||
|
|
||||||
// TODO: Deflecting the fireballs by arrow- or sword- hits
|
// TODO: Deflecting the fireballs by arrow- or sword- hits
|
||||||
|
|
||||||
} ;
|
} ; // tolua_export
|
||||||
|
@ -45,4 +45,4 @@ void cThrownSnowballEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d &
|
|||||||
a_EntityHit.TakeDamage(dtRangedAttack, this, TotalDamage, 1);
|
a_EntityHit.TakeDamage(dtRangedAttack, this, TotalDamage, 1);
|
||||||
|
|
||||||
Destroy(true);
|
Destroy(true);
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
//
|
//
|
||||||
// ProjectileEgg.h
|
// ProjectileSnowball.h
|
||||||
//
|
//
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
@ -31,4 +31,4 @@ protected:
|
|||||||
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
|
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
|
||||||
virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
|
virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
|
||||||
|
|
||||||
} ;
|
} ; // tolua_export
|
||||||
|
Loading…
x
Reference in New Issue
Block a user