diff options
| author | Filip Gawin <filip.gawin@zoho.com> | 2019-08-02 17:43:40 +0200 |
|---|---|---|
| committer | Filip Gawin <filip.gawin@zoho.com> | 2019-08-27 21:14:28 +0200 |
| commit | 458fc63f0196dc92362b44d5cf7ebf67bbc903e1 (patch) | |
| tree | aa190341ec4d5ee449c80c20fea3c09e4f655532 /src/vehicles/Heli.cpp | |
| parent | af5bd951aeb43c341d5126bc4141992169e46d57 (diff) | |
Cleanup
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 |