diff options
| author | madmaxoft <github@xoft.cz> | 2014-04-28 22:05:02 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-04-28 22:05:02 +0200 |
| commit | 0b16e6821ff475dca0539426ec403241170ce93d (patch) | |
| tree | e272cae036cd9117e1d1f4cea3555c0c0d3aa748 /src/Mobs/Monster.h | |
| parent | Added the G1 root cert. (diff) | |
| parent | Merge pull request #940 from Howaner/GlobalFixes (diff) | |
| download | cuberite-0b16e6821ff475dca0539426ec403241170ce93d.tar cuberite-0b16e6821ff475dca0539426ec403241170ce93d.tar.gz cuberite-0b16e6821ff475dca0539426ec403241170ce93d.tar.bz2 cuberite-0b16e6821ff475dca0539426ec403241170ce93d.tar.lz cuberite-0b16e6821ff475dca0539426ec403241170ce93d.tar.xz cuberite-0b16e6821ff475dca0539426ec403241170ce93d.tar.zst cuberite-0b16e6821ff475dca0539426ec403241170ce93d.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Mobs/Monster.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h index 70b3783fc..7d7e90eb2 100644 --- a/src/Mobs/Monster.h +++ b/src/Mobs/Monster.h @@ -66,7 +66,8 @@ public: mfAmbient = 2, // Bats mfWater = 3, // Squid - mfMaxplusone, // Nothing. Be sure this is the last and the others are in order + mfNoSpawn, + mfUnhandled, // Nothing. Be sure this is the last and the others are in order } ; // tolua_end @@ -87,7 +88,7 @@ public: virtual void Tick(float a_Dt, cChunk & a_Chunk) override; - virtual void DoTakeDamage(TakeDamageInfo & a_TDI) override; + virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) override; virtual void KilledBy(cEntity * a_Killer) override; |