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/peds/PlayerPed.cpp | |
| parent | More audio ped (diff) | |
| download | re3-458fc63f0196dc92362b44d5cf7ebf67bbc903e1.tar re3-458fc63f0196dc92362b44d5cf7ebf67bbc903e1.tar.gz re3-458fc63f0196dc92362b44d5cf7ebf67bbc903e1.tar.bz2 re3-458fc63f0196dc92362b44d5cf7ebf67bbc903e1.tar.lz re3-458fc63f0196dc92362b44d5cf7ebf67bbc903e1.tar.xz re3-458fc63f0196dc92362b44d5cf7ebf67bbc903e1.tar.zst re3-458fc63f0196dc92362b44d5cf7ebf67bbc903e1.zip | |
Diffstat (limited to 'src/peds/PlayerPed.cpp')
| -rw-r--r-- | src/peds/PlayerPed.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp index 1dcbdf46..5ae8c4be 100644 --- a/src/peds/PlayerPed.cpp +++ b/src/peds/PlayerPed.cpp @@ -97,16 +97,8 @@ 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 |