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/peds/PlayerPed.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/peds/PlayerPed.cpp')
| -rw-r--r-- | src/peds/PlayerPed.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp index 5ae8c4be..1dcbdf46 100644 --- a/src/peds/PlayerPed.cpp +++ b/src/peds/PlayerPed.cpp @@ -97,8 +97,16 @@ CPlayerPed::AnnoyPlayerPed(bool annoyedByPassingEntity) class CPlayerPed_ : public CPlayerPed { public: +<<<<<<< HEAD +<<<<<<< HEAD CPlayerPed* ctor(void) { return ::new (this) CPlayerPed(); } void dtor(void) { CPlayerPed::~CPlayerPed(); } +======= + void dtor(void) { this->~CPlayerPed(); } +>>>>>>> More audio ped +======= + void dtor(void) { CPlayerPed::~CPlayerPed(); } +>>>>>>> fix }; STARTPATCHES |