1
0

Fixed ToLua issues

This commit is contained in:
archshift 2014-04-26 17:58:06 -07:00
parent e3c3795aa4
commit cc39d314ae
9 changed files with 24 additions and 19 deletions

View File

@ -57,6 +57,14 @@ if (NOT MSVC)
Entities/Pickup.h Entities/Pickup.h
Entities/Player.h Entities/Player.h
Entities/ProjectileEntity.h Entities/ProjectileEntity.h
Entities/ProjectileArrow.h
Entities/ProjectileEgg.h
Entities/ProjectileEnderPearl.h
Entities/ProjectileExpBottle.h
Entities/ProjectileSnowball.h
Entities/ProjectileFireCharge.h
Entities/ProjectileFirework.h
Entities/ProjectileGhastFireball.h
Entities/TNTEntity.h Entities/TNTEntity.h
Entities/ExpOrb.h Entities/ExpOrb.h
Entities/HangingEntity.h Entities/HangingEntity.h

View File

@ -10,6 +10,8 @@
// tolua_begin
class cArrowEntity : class cArrowEntity :
public cProjectileEntity public cProjectileEntity
{ {
@ -91,5 +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_begin
}; };

View File

@ -10,6 +10,8 @@
// tolua_begin
class cThrownEggEntity : class cThrownEggEntity :
public cProjectileEntity public cProjectileEntity
{ {
@ -25,8 +27,6 @@ public:
protected: protected:
// tolua_end
// 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;
virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override; virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
@ -34,6 +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_begin
} ; } ;

View File

@ -10,6 +10,8 @@
// tolua_begin
class cThrownEnderPearlEntity : class cThrownEnderPearlEntity :
public cProjectileEntity public cProjectileEntity
{ {
@ -25,8 +27,6 @@ public:
protected: protected:
// tolua_end
// 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;
virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override; virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
@ -34,6 +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_begin
} ; } ;

View File

@ -10,6 +10,8 @@
// tolua_begin
class cExpBottleEntity : class cExpBottleEntity :
public cProjectileEntity public cProjectileEntity
{ {
@ -28,6 +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_begin
}; };

View File

@ -10,6 +10,8 @@
// tolua_begin
class cFireChargeEntity : class cFireChargeEntity :
public cProjectileEntity public cProjectileEntity
{ {
@ -31,6 +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_begin
} ; } ;

View File

@ -10,6 +10,8 @@
// tolua_begin
class cFireworkEntity : class cFireworkEntity :
public cProjectileEntity public cProjectileEntity
{ {
@ -35,6 +37,4 @@ private:
int m_ExplodeTimer; int m_ExplodeTimer;
cItem m_FireworkItem; cItem m_FireworkItem;
// tolua_begin
}; };

View File

@ -10,6 +10,8 @@
// tolua_begin
class cGhastFireballEntity : class cGhastFireballEntity :
public cProjectileEntity public cProjectileEntity
{ {
@ -33,6 +35,4 @@ protected:
// TODO: Deflecting the fireballs by arrow- or sword- hits // TODO: Deflecting the fireballs by arrow- or sword- hits
// tolua_begin
} ; } ;

View File

@ -10,6 +10,8 @@
// tolua_begin
class cThrownSnowballEntity : class cThrownSnowballEntity :
public cProjectileEntity public cProjectileEntity
{ {
@ -29,6 +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_begin
} ; } ;