Merge branch 'miami' into lcs

# Conflicts:
#	src/control/CarCtrl.cpp
#	src/control/Script4.cpp
#	src/core/Frontend.cpp

src/save/GenericGameStorage.cpp

@@ -540,7 +540,11 @@ GetNameOfSavedGame(int32 slot)
 bool
 CheckDataNotCorrupt(int32 slot, char *name)
 {
+#ifdef FIX_BUGS
+	char filename[MAX_PATH];
+#else
 	char filename[100];
+#endif
 
 	int32 blocknum = 0;
 	eLevelName level = LEVEL_GENERIC;

src/save/PCSave.cpp

@@ -25,7 +25,11 @@ C_PcSave::SetSaveDirectory(const char *path)
 bool
 C_PcSave::DeleteSlot(int32 slot)
 {
+#ifdef FIX_BUGS
+	char FileName[MAX_PATH];
+#else
 	char FileName[200];
+#endif
 
 	PcSaveHelper.nErrorCode = SAVESTATUS_SUCCESSFUL;
 	sprintf(FileName, "%s%i.b", DefaultPCSaveFileName, slot + 1);

src/save/SaveBuf.h

@@ -111,5 +111,5 @@ WriteSaveBuf(uint8 *&buf, uint32 &length, const T &value)
 	} while(0)
 #else
 #define CheckSaveHeader(buf, a, b, c, d, size) SkipSaveBuf(buf, 8);
-#define CheckSaveHeaderWithLength(buf, a, b, c, d, size) SkipSaveBuf(buf, 8);
+#define CheckSaveHeaderWithLength(buf, len, a, b, c, d, size) SkipSaveBuf(buf, 8);
 #endif