diff options
| author | Filip Gawin <filip.gawin@zoho.com> | 2019-07-31 17:54:18 +0200 |
|---|---|---|
| committer | Filip Gawin <filip.gawin@zoho.com> | 2019-08-27 21:13:17 +0200 |
| commit | af5bd951aeb43c341d5126bc4141992169e46d57 (patch) | |
| tree | 08c819a7c31d30abb6915b21b80239ace256b692 /src/vehicles/Heli.cpp | |
| parent | Merge pull request #197 from Nick007J/master (diff) | |
| download | re3-af5bd951aeb43c341d5126bc4141992169e46d57.tar re3-af5bd951aeb43c341d5126bc4141992169e46d57.tar.gz re3-af5bd951aeb43c341d5126bc4141992169e46d57.tar.bz2 re3-af5bd951aeb43c341d5126bc4141992169e46d57.tar.lz re3-af5bd951aeb43c341d5126bc4141992169e46d57.tar.xz re3-af5bd951aeb43c341d5126bc4141992169e46d57.tar.zst re3-af5bd951aeb43c341d5126bc4141992169e46d57.zip | |
Diffstat (limited to 'src/vehicles/Heli.cpp')
| -rw-r--r-- | src/vehicles/Heli.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/vehicles/Heli.cpp b/src/vehicles/Heli.cpp index 9b1a651d..1c242f0e 100644 --- a/src/vehicles/Heli.cpp +++ b/src/vehicles/Heli.cpp @@ -1038,8 +1038,16 @@ 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 |