diff options
Diffstat (limited to 'src/vehicles/Heli.cpp')
| -rw-r--r-- | src/vehicles/Heli.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/vehicles/Heli.cpp b/src/vehicles/Heli.cpp index 1c242f0e..9b1a651d 100644 --- a/src/vehicles/Heli.cpp +++ b/src/vehicles/Heli.cpp @@ -1038,16 +1038,8 @@ void CHeli::ActivateHeli(bool activate) { ScriptHeliOn = activate; } class CHeli_ : public CHeli { public: -<<<<<<< HEAD -<<<<<<< HEAD void ctor(int32 id, uint8 CreatedBy) { ::new (this) CHeli(id, CreatedBy); } void dtor(void) { CHeli::~CHeli(); } -======= - void dtor(void) { this->~CHeli(); } ->>>>>>> More audio ped -======= - void dtor(void) { CHeli::~CHeli(); } ->>>>>>> fix }; STARTPATCHES |