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

Minor fixes

Browse Source
This commit is contained in:
andrew 2014-03-25 09:10:55 +02:00
parent 6b77dc74ad
commit 4f3377bbbf
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mobs/Villager.h
View File

@ -29,7 +29,7 @@ public:
CLASS_PROTODEF(cVillager); CLASS_PROTODEF(cVillager);
// Override functions // cEntity overrides
virtual void DoTakeDamage(TakeDamageInfo & a_TDI) override; virtual void DoTakeDamage(TakeDamageInfo & a_TDI) override;
virtual void Tick (float a_Dt, cChunk & a_Chunk) override; virtual void Tick (float a_Dt, cChunk & a_Chunk) override;

5
src/Mobs/Wither.h
View File

@ -21,17 +21,16 @@ public:
void SetNumInvulnerableTicks(unsigned int a_Ticks) { m_InvulnerableTicks = a_Ticks; } 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 GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
virtual void DoTakeDamage(TakeDamageInfo & a_TDI) override; virtual void DoTakeDamage(TakeDamageInfo & a_TDI) override;
virtual void Tick(float a_Dt, cChunk & a_Chunk) override; virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
private: private:
/** The number of ticks of invulnerability left after being initially created. Zero once invulnerability has expired. */ /** The number of ticks of invulnerability left after being initially created. Zero once invulnerability has expired. */
unsigned int m_InvulnerableTicks; unsigned int m_InvulnerableTicks;
} ; } ;

20
src/World.h
View File

@ -497,16 +497,16 @@ public:
/** Does an explosion with the specified strength at the specified coordinate /** Does an explosion with the specified strength at the specified coordinate
a_SourceData exact type depends on the a_Source: a_SourceData exact type depends on the a_Source:
| esOther | void * | | esOther | void * |
| esPrimedTNT | cTNTEntity * | | esPrimedTNT | cTNTEntity * |
| esMonster | cMonster * | | esMonster | cMonster * |
| esBed | cVector3i * | | esBed | cVector3i * |
| esEnderCrystal | Vector3i * | | esEnderCrystal | Vector3i * |
| esGhastFireball | cGhastFireball * | | esGhastFireball | cGhastFireball * |
| esWitherSkullBlack | TBD | | esWitherSkullBlack | TBD |
| esWitherSkullBlue | TBD | | esWitherSkullBlue | TBD |
| esWitherBirth | cWither * | | esWitherBirth | cMonster * |
| esPlugin | void * | | 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 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