summaryrefslogtreecommitdiffstats
path: root/src/vehicles/Plane.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/vehicles/Plane.cpp')
-rw-r--r--src/vehicles/Plane.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/vehicles/Plane.cpp b/src/vehicles/Plane.cpp
index 775cf572..771f36e1 100644
--- a/src/vehicles/Plane.cpp
+++ b/src/vehicles/Plane.cpp
@@ -968,8 +968,16 @@ 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