Merge remote-tracking branch 'upstream/lcs' into lcs

premake5.lua

@@ -68,7 +68,7 @@ end
 
 workspace "reLCS"
 	language "C++"
-	configurations { "Debug", "Release", "Vanilla" }
+	configurations { "Debug", "Release" }
 	startproject "reLCS"
 	location "build"
 	symbols "Full"
@@ -86,7 +86,8 @@ workspace "reLCS"
 		linkoptions { "-fsanitize=address" }
 	end
 
-	filter { "system:windows" }
+	filter { "system:windows" }
+		configurations { "Vanilla" }
 		platforms {
 			"win-x86-RW34_d3d8-mss",
 			"win-x86-librw_d3d9-mss",
@@ -130,9 +131,6 @@ workspace "reLCS"
 			flags { "LinkTimeOptimization" }
 		end
 
-	filter "configurations:Vanilla"
-		defines { "VANILLA_DEFINES" }
-
 	filter { "platforms:win*" }
 		system "windows"
 
@@ -324,7 +322,10 @@ project "reLCS"
 		includedirs { "vendor/ogg/include" }
 		includedirs { "vendor/opus/include" }
 		includedirs { "vendor/opusfile/include" }
-	end
+	end
+
+	filter "configurations:Vanilla"
+		defines { "VANILLA_DEFINES" }
 
 	filter "platforms:*mss"
 		defines { "AUDIO_MSS" }

src/core/config.h

@@ -211,6 +211,10 @@ enum Config {
 #define DEFAULT_NATIVE_RESOLUTION // Set default video mode to your native resolution (fixes Windows 10 launch)
 
 #ifdef VANILLA_DEFINES
+#if !defined(_WIN32) || defined(__LP64__) || defined(_WIN64)
+#error Vanilla can only be built for win-x86
+#endif
+
 #define FINAL
 #define MASTER
 //#define USE_MY_DOCUMENTS

src/save/GenericGameStorage.cpp

@@ -828,6 +828,13 @@ FixGarages(uint8 save_type, uint8 *buf, uint8 *buf2, uint32 *size)
 
 		SkipBuf(buf2, sizeof(CStoredCar));
 	}
+
+	*size = 0;
+
+	assert(buf - buf_start == read);
+	assert(buf2 - buf2_start == written);
+
+	*size = 7876;
 }
 
 static void