Last VS2015 compile fixes

Client/mods/deathmatch/vs2015_fixes.cpp

@@ -0,0 +1,15 @@
+#include "StdInc.h"
+
+#if _MSC_VER == 1900
+    /**
+     * VS2015 defines std io in another way which is incompatible to the way VS2013 used
+     * We can fix this however by defining the old way manually
+     * It's only required for libspeex, so once we replace libspeex, we can remove this fix
+     */
+    FILE _iob[] = { *stdin, *stdout, *stderr };
+
+    extern "C" FILE * __cdecl __iob_func(void)
+    {
+        return _iob;
+    }
+#endif

Client/multiplayer_sa/CMultiplayerSA.cpp

@@ -6638,6 +6638,7 @@ void CTaskSimpleGangDriveBy__ProcessPed()
         *pRequiredAnim = m_pDrivebyAnimationHandler(*pRequiredAnim, requiredAnimGroup);
 }
 
+DWORD RETURN_CTaskSimpleGangDriveBy_ProcessPed_Cancel = 0x62D5C1;
 void _declspec(naked) HOOK_CTaskSimpleGangDriveBy__ProcessPed()
 {
     // esi contains 'this'
@@ -6649,14 +6650,16 @@ void _declspec(naked) HOOK_CTaskSimpleGangDriveBy__ProcessPed()
     CTaskSimpleGangDriveBy__ProcessPed();
     _asm
     {
-        popad;
+        popad
         // Replaced code
-        cmp[esi + 28h], edi;    // .text:0062D5A7
-        jnz 0x62D5C1;           // .text:0062D5AA
+        cmp[esi + 28h], edi                // .text:0062D5A7
+        jnz GangDriveBy_ProcessPed_Cancel  // .text:0062D5AA
         // Return to original code
-        jmp RETURN_CTaskSimplyGangDriveBy__ProcessPed;
+        jmp RETURN_CTaskSimplyGangDriveBy__ProcessPed
+
+    GangDriveBy_ProcessPed_Cancel:
+        jmp RETURN_CTaskSimpleGangDriveBy_ProcessPed_Cancel
     }
-
 }
 
 
@@ -6867,4 +6870,4 @@ void _declspec(naked) HOOK_CAERadioTrackManager__ChooseMusicTrackIndex ( )
         // jump back to normal processing
         jmp RETURN_CAERadioTrackManager__ChooseMusicTrackIndex
     }
-}
+}

Client/multiplayer_sa/CMultiplayerSA_1.3.cpp

@@ -1437,8 +1437,11 @@ void _declspec( naked ) HOOK_CWorld_RemoveFallenCars ( )
         popad
         mov eax, [esi + 14h]
         test eax, eax
-        jz 565F57h
+        jz RemoveFallenCars_Cancel
         jmp RETURN_CWorld_RemoveFallenCars_Cont
+
+     RemoveFallenCars_Cancel:
+        jmp HOOK_CWorld_RemoveFallenCars_Cont1
     }
 }
 
@@ -1608,8 +1611,11 @@ void _declspec( naked ) HOOK_CMultiplayerSA_ToggleTyreSmoke ( )
     {
         popad
         test eax, 20000h
-        jnz 06DF3B9h
+        jnz ToggleTyreSmoke_Cancel
         jmp dwReturnAddressTyreSmoke
+
+    ToggleTyreSmoke_Cancel:
+        jmp dwReturnIgnorePed
     }
 }
 
@@ -1697,4 +1703,4 @@ void _declspec(naked) HOOK_CProjectile_FixExplosionLocation ( )
         lea eax, [esi+4]
         jmp RETURN_CProjectile_FixExplosionLocation
     }
-}
+}