From af5bd951aeb43c341d5126bc4141992169e46d57 Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Wed, 31 Jul 2019 17:54:18 +0200
Subject: More audio ped

---
 src/peds/PlayerPed.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/peds/PlayerPed.cpp')

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
-- 
cgit v1.2.3