A couple more cherry-picks for 1.5.2

.github/workflows/Windows_MSVC_x64.yml

@@ -31,9 +31,9 @@ jobs:
       uses: lukka/get-cmake@latest
 
     - name: Restore or setup vcpkg
-      uses: lukka/run-vcpkg@v11.1
+      uses: lukka/run-vcpkg@v11.3
       with:
-        vcpkgGitCommitId: '927bc12e31148b0d44ae9d174b96c20e3bcf08eb'
+        vcpkgGitCommitId: '16ee2ecb31788c336ace8bb14c21801efb6836e4'
 
     - name: Fetch test data
       run: |

Source/engine.cpp

@@ -52,11 +52,7 @@ void DrawHalfTransparentAligned32BlendedRectTo(const Surface &out, unsigned sx,
 	while (height-- > 0) {
 		for (unsigned i = 0; i < width; ++i, ++pix) {
 			const uint32_t v = *pix;
-#if SDL_BYTEORDER == SDL_LIL_ENDIAN
 			*pix = lookupTable[v & 0xFFFF] | (lookupTable[(v >> 16) & 0xFFFF] << 16);
-#else
-			*pix = lookupTable[(v >> 16) & 0xFFFF] | (lookupTable[v & 0xFFFF] << 16);
-#endif
 		}
 		pix += skipX;
 	}

Source/engine/palette.cpp

@@ -103,11 +103,7 @@ void GenerateBlendedLookupTable(std::array<SDL_Color, 256> &palette, int skipFro
 #if DEVILUTIONX_PALETTE_TRANSPARENCY_BLACK_16_LUT
 	for (unsigned i = 0; i < 256; ++i) {
 		for (unsigned j = 0; j < 256; ++j) {
-#if SDL_BYTEORDER == SDL_LIL_ENDIAN
 			const std::uint16_t index = i | (j << 8);
-#else
-			const std::uint16_t index = j | (i << 8);
-#endif
 			paletteTransparencyLookupBlack16[index] = paletteTransparencyLookup[0][i] | (paletteTransparencyLookup[0][j] << 8);
 		}
 	}

vcpkg.json

@@ -1,37 +1,37 @@
 {
-    "name": "devilutionx",
-    "version-string": "1.4.0",
-    "dependencies": [
-        "fmt",
-        "bzip2",
-        "simpleini"
-    ],
-    "builtin-baseline": "927bc12e31148b0d44ae9d174b96c20e3bcf08eb",
-    "features": {
-        "sdl1": {
-            "description": "Use SDL1.2 instead of SDL2",
-            "dependencies": [ "sdl1", "libpng" ]
-        },
-        "sdl2": {
-            "description": "Use SDL2",
-            "dependencies": [ "sdl2", "sdl2-image" ]
-        },
-        "encryption": {
-            "description": "Build libsodium for packet encryption",
-            "dependencies": [ "libsodium" ]
-        },
-        "translations": {
-            "description": "Build translation files",
-            "dependencies": [
-                {
-                    "name": "gettext",
-                    "features": [ "tools" ]
-                }
-            ]
-        },
-        "tests": {
-            "description": "Build tests",
-            "dependencies": [ "gtest" ]
-        }
-    }
+	"name": "devilutionx",
+	"version-string": "1.5.2",
+	"dependencies": [
+		"fmt",
+		"bzip2",
+		"simpleini"
+	],
+	"builtin-baseline": "16ee2ecb31788c336ace8bb14c21801efb6836e4",
+	"features": {
+		"sdl1": {
+			"description": "Use SDL1.2 instead of SDL2",
+			"dependencies": [ "sdl1", "libpng" ]
+		},
+		"sdl2": {
+			"description": "Use SDL2",
+			"dependencies": [ "sdl2", "sdl2-image" ]
+		},
+		"encryption": {
+			"description": "Build libsodium for packet encryption",
+			"dependencies": [ "libsodium" ]
+		},
+		"translations": {
+			"description": "Build translation files",
+			"dependencies": [
+				{
+					"name": "gettext",
+					"features": [ "tools" ]
+				}
+			]
+		},
+		"tests": {
+			"description": "Build tests",
+			"dependencies": [ "gtest" ]
+		}
+	}
 }