diff options
Diffstat (limited to 'src/vehicles/Plane.cpp')
| -rw-r--r-- | src/vehicles/Plane.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/vehicles/Plane.cpp b/src/vehicles/Plane.cpp index 771f36e1..775cf572 100644 --- a/src/vehicles/Plane.cpp +++ b/src/vehicles/Plane.cpp @@ -968,16 +968,8 @@ bool CPlane::HasDropOffCesnaBeenShotDown(void) { return DropOffCesnaMissionStatu class CPlane_ : public CPlane { public: -<<<<<<< HEAD -<<<<<<< HEAD void ctor(int32 id, uint8 CreatedBy) { ::new (this) CPlane(id, CreatedBy); } void dtor(void) { CPlane::~CPlane(); } -======= - void dtor(void) { this->~CPlane(); } ->>>>>>> More audio ped -======= - void dtor(void) { CPlane::~CPlane(); } ->>>>>>> fix }; STARTPATCHES |