diff options
Diffstat (limited to 'src/Entities')
| -rw-r--r-- | src/Entities/Pawn.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/Entities/Pawn.h b/src/Entities/Pawn.h index 4d35789a9..e882e18f7 100644 --- a/src/Entities/Pawn.h +++ b/src/Entities/Pawn.h @@ -22,8 +22,13 @@ public: CLASS_PROTODEF(cPawn) cPawn(eEntityType a_EntityType, double a_Width, double a_Height); +<<<<<<< HEAD + ~cPawn(); + +======= virtual bool OnPreWorldTravel(cWorld & a_NewWorld) override; +>>>>>>> origin/fixes virtual void Destroyed() override; virtual void Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override; |