Merge branch 'master' into master

src/vehicles/Boat.cpp

@@ -20,7 +20,6 @@ CBoat::CBoat(int mi, uint8 owner)
 
 WRAPPER CBoat* CBoat::ctor(int, uint8) { EAXJMP(0x53E3E0); }
 
-
 bool CBoat::IsSectorAffectedByWake(CVector2D sector, float fSize, CBoat **apBoats)
 {
 	uint8 numVerts = 0;
@@ -71,7 +70,12 @@ float CBoat::IsVertexAffectedByWake(CVector vecVertex, CBoat *pBoat)
 
 WRAPPER void CBoat::FillBoatList(void) { EAXJMP(0x542250); }
 
+class CBoat_ : public CBoat
+{
+public:
+	void dtor() { CBoat::~CBoat(); };
+};
 
 STARTPATCHES
-InjectHook(0x53E790, &CBoat::dtor, PATCH_JUMP);
-ENDPATCHES
+	InjectHook(0x53E790, &CBoat_::dtor, PATCH_JUMP);
+ENDPATCHES