diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-05-01 20:50:40 +0200 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-05-01 20:50:40 +0200 |
| commit | 8780b324ff075f17358b01bc3615da0397fbe8be (patch) | |
| tree | d448ab665fd50cca3861e06654f8668a89c8d953 /src/Mobs/Monster.h | |
| parent | Added Testing capability (diff) | |
| parent | Fixed MSVC2013 compilation. (diff) | |
| download | cuberite-8780b324ff075f17358b01bc3615da0397fbe8be.tar cuberite-8780b324ff075f17358b01bc3615da0397fbe8be.tar.gz cuberite-8780b324ff075f17358b01bc3615da0397fbe8be.tar.bz2 cuberite-8780b324ff075f17358b01bc3615da0397fbe8be.tar.lz cuberite-8780b324ff075f17358b01bc3615da0397fbe8be.tar.xz cuberite-8780b324ff075f17358b01bc3615da0397fbe8be.tar.zst cuberite-8780b324ff075f17358b01bc3615da0397fbe8be.zip | |
Diffstat (limited to 'src/Mobs/Monster.h')
| -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; |