mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-10-18 07:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup

Browse source
This commit is contained in:
Filip Gawin 2019-08-02 17:43:40 +02:00
commit 458fc63f01
41 changed files with 1487 additions and 8021 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/vehicles/Heli.cpp
View file

@ -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