diff options
| author | andrew <xdotftw@gmail.com> | 2014-03-25 08:10:55 +0100 |
|---|---|---|
| committer | andrew <xdotftw@gmail.com> | 2014-03-25 08:10:55 +0100 |
| commit | 4f3377bbbfa12623be61561ae75bdd9d8d5fbe8c (patch) | |
| tree | 91e1d1624379b182ed99c48f320d4fc0d6c3779d /src | |
| parent | Wither invulnerability (diff) | |
| download | cuberite-4f3377bbbfa12623be61561ae75bdd9d8d5fbe8c.tar cuberite-4f3377bbbfa12623be61561ae75bdd9d8d5fbe8c.tar.gz cuberite-4f3377bbbfa12623be61561ae75bdd9d8d5fbe8c.tar.bz2 cuberite-4f3377bbbfa12623be61561ae75bdd9d8d5fbe8c.tar.lz cuberite-4f3377bbbfa12623be61561ae75bdd9d8d5fbe8c.tar.xz cuberite-4f3377bbbfa12623be61561ae75bdd9d8d5fbe8c.tar.zst cuberite-4f3377bbbfa12623be61561ae75bdd9d8d5fbe8c.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/Mobs/Villager.h | 2 | ||||
| -rw-r--r-- | src/Mobs/Wither.h | 5 | ||||
| -rw-r--r-- | src/World.h | 20 |
3 files changed, 13 insertions, 14 deletions
diff --git a/src/Mobs/Villager.h b/src/Mobs/Villager.h index b99ae876f..5bba4d4ba 100644 --- a/src/Mobs/Villager.h +++ b/src/Mobs/Villager.h @@ -29,7 +29,7 @@ public: CLASS_PROTODEF(cVillager); - // Override functions + // cEntity overrides virtual void DoTakeDamage(TakeDamageInfo & a_TDI) override; virtual void Tick (float a_Dt, cChunk & a_Chunk) override; diff --git a/src/Mobs/Wither.h b/src/Mobs/Wither.h index df3a57798..d09e3607a 100644 --- a/src/Mobs/Wither.h +++ b/src/Mobs/Wither.h @@ -21,17 +21,16 @@ public: void SetNumInvulnerableTicks(unsigned int a_Ticks) { m_InvulnerableTicks = a_Ticks; } - // Override functions + // cEntity overrides virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override; - virtual void DoTakeDamage(TakeDamageInfo & a_TDI) override; - virtual void Tick(float a_Dt, cChunk & a_Chunk) override; private: /** The number of ticks of invulnerability left after being initially created. Zero once invulnerability has expired. */ unsigned int m_InvulnerableTicks; + } ; diff --git a/src/World.h b/src/World.h index 79fcc5616..bb2eb0b21 100644 --- a/src/World.h +++ b/src/World.h @@ -497,16 +497,16 @@ public: /** Does an explosion with the specified strength at the specified coordinate a_SourceData exact type depends on the a_Source: - | esOther | void * | - | esPrimedTNT | cTNTEntity * | - | esMonster | cMonster * | - | esBed | cVector3i * | - | esEnderCrystal | Vector3i * | - | esGhastFireball | cGhastFireball * | - | esWitherSkullBlack | TBD | - | esWitherSkullBlue | TBD | - | esWitherBirth | cWither * | - | esPlugin | void * | + | esOther | void * | + | esPrimedTNT | cTNTEntity * | + | esMonster | cMonster * | + | esBed | cVector3i * | + | esEnderCrystal | Vector3i * | + | esGhastFireball | cGhastFireball * | + | esWitherSkullBlack | TBD | + | esWitherSkullBlue | TBD | + | esWitherBirth | cMonster * | + | esPlugin | void * | */ virtual void DoExplosionAt(double a_ExplosionSize, double a_BlockX, double a_BlockY, double a_BlockZ, bool a_CanCauseFire, eExplosionSource a_Source, void * a_SourceData); // tolua_export // override, cannot specify due to tolua |