From a89bcf837b3c976f0cff24cd99d4dd82b2e03261 Mon Sep 17 00:00:00 2001
From: Itms <itms@wildfiregames.com>
Date: Tue, 1 May 2018 20:29:36 +0000
Subject: [PATCH] Fix the window icon that cannot be loaded in release
 packages, refs 27d99765bb.

Discussed with Imarok and elexis.

This was SVN commit r21812.
---
 binaries/data/mods/mod/art/{textures => }/icons/window.png   | 0
 .../data/mods/public/art/{textures => }/icons/window.png     | 0
 source/ps/VideoMode.cpp                                      | 5 ++++-
 3 files changed, 4 insertions(+), 1 deletion(-)
 rename binaries/data/mods/mod/art/{textures => }/icons/window.png (100%)
 rename binaries/data/mods/public/art/{textures => }/icons/window.png (100%)

diff --git a/binaries/data/mods/mod/art/textures/icons/window.png b/binaries/data/mods/mod/art/icons/window.png
similarity index 100%
rename from binaries/data/mods/mod/art/textures/icons/window.png
rename to binaries/data/mods/mod/art/icons/window.png
diff --git a/binaries/data/mods/public/art/textures/icons/window.png b/binaries/data/mods/public/art/icons/window.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/icons/window.png
rename to binaries/data/mods/public/art/icons/window.png
diff --git a/source/ps/VideoMode.cpp b/source/ps/VideoMode.cpp
index 2552c81849..5cca5fe0d9 100644
--- a/source/ps/VideoMode.cpp
+++ b/source/ps/VideoMode.cpp
@@ -500,9 +500,12 @@ SDL_Window* CVideoMode::GetWindow()
 
 void CVideoMode::SetWindowIcon()
 {
+	// The window icon should be kept outside of art/textures/, or else it will be converted
+	// to DDS by the archive builder and will become unusable here. Using DDS makes BGRA
+	// conversion needlessly complicated.
 	std::shared_ptr<u8> iconFile;
 	size_t iconFileSize;
-	if (g_VFS->LoadFile("art/textures/icons/window.png", iconFile, iconFileSize) != INFO::OK)
+	if (g_VFS->LoadFile("art/icons/window.png", iconFile, iconFileSize) != INFO::OK)
 	{
 		LOGWARNING("Window icon not found.");
 		return;