diff options
| author | madmaxoft <github@xoft.cz> | 2014-07-17 11:07:10 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-07-17 11:07:10 +0200 |
| commit | 430d8b42a5b8889ff3c0bfaea84ede7e543e2b64 (patch) | |
| tree | ff39210d9fe1f137b1884b18725cee8572c1cc76 | |
| parent | Merge branch 'master' into potions (diff) | |
| download | cuberite-430d8b42a5b8889ff3c0bfaea84ede7e543e2b64.tar cuberite-430d8b42a5b8889ff3c0bfaea84ede7e543e2b64.tar.gz cuberite-430d8b42a5b8889ff3c0bfaea84ede7e543e2b64.tar.bz2 cuberite-430d8b42a5b8889ff3c0bfaea84ede7e543e2b64.tar.lz cuberite-430d8b42a5b8889ff3c0bfaea84ede7e543e2b64.tar.xz cuberite-430d8b42a5b8889ff3c0bfaea84ede7e543e2b64.tar.zst cuberite-430d8b42a5b8889ff3c0bfaea84ede7e543e2b64.zip | |
| -rw-r--r-- | src/Entities/Pawn.cpp | 4 | ||||
| -rw-r--r-- | src/Entities/Pawn.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Entities/Pawn.cpp b/src/Entities/Pawn.cpp index 840736f6a..fe6c24a7a 100644 --- a/src/Entities/Pawn.cpp +++ b/src/Entities/Pawn.cpp @@ -49,10 +49,10 @@ void cPawn::Tick(float a_Dt, cChunk & a_Chunk) -void cPawn::KilledBy(cEntity * a_Killer) +void cPawn::KilledBy(TakeDamageInfo & a_TDI) { ClearEntityEffects(); - super::KilledBy(a_Killer); + super::KilledBy(a_TDI); } diff --git a/src/Entities/Pawn.h b/src/Entities/Pawn.h index 252ec5edb..63c7cfbb6 100644 --- a/src/Entities/Pawn.h +++ b/src/Entities/Pawn.h @@ -21,7 +21,7 @@ public: cPawn(eEntityType a_EntityType, double a_Width, double a_Height); virtual void Tick(float a_Dt, cChunk & a_Chunk) override; - virtual void KilledBy(cEntity * a_Killer) override; + virtual void KilledBy(TakeDamageInfo & a_TDI) override; // tolua_begin |