Merge remote-tracking branch 'origin/miami' into lcs

# Conflicts:
#	src/animation/CutsceneMgr.cpp
#	src/control/CarCtrl.cpp
#	src/control/Script.cpp
#	src/control/Script2.cpp
#	src/core/Frontend.cpp
#	src/core/main.cpp
#	src/entities/Physical.cpp
#	src/peds/Ped.cpp
#	src/peds/PedAI.cpp
#	src/text/Messages.cpp
#	src/vehicles/Cranes.cpp
#	src/vehicles/Transmission.cpp

src/save/GenericGameStorage.cpp

@@ -41,8 +41,6 @@
 #include "Timecycle.h"
 #include "Fluff.h"
 
-// --MIAMI: file done
-
 #define BLOCK_COUNT 22
 #define SIZE_OF_SIMPLEVARS 0xE8
 
@@ -347,7 +345,7 @@ GenericLoad()
 #endif
 	ReadDataFromBufferPointer(buf, CGame::currArea);
 	ReadDataFromBufferPointer(buf, CVehicle::bAllTaxisHaveNitro);
-	ReadDataFromBufferPointer(buf, CPad::bInvertLook4Pad);
+	buf += align4bytes(sizeof(CPad::bInvertLook4Pad));
 	ReadDataFromBufferPointer(buf, CTimeCycle::m_ExtraColour);
 	ReadDataFromBufferPointer(buf, CTimeCycle::m_bExtraColourOn);
 	ReadDataFromBufferPointer(buf, CTimeCycle::m_ExtraColourInter);

src/save/PCSave.cpp

@@ -12,8 +12,6 @@
 #include "PCSave.h"
 #include "Text.h"
 
-// --MIAMI: file done
-
 const char* _psGetUserFilesFolder();
 
 C_PcSave PcSaveHelper;