code review

client/render/hdEdition/DdsFormat.h

@@ -17,7 +17,13 @@ VCMI_LIB_NAMESPACE_BEGIN
 class CInputStream;
 VCMI_LIB_NAMESPACE_END
 
-#define FOURCC(a,b,c,d) (uint32_t(uint8_t(a)) | (uint32_t(uint8_t(b))<<8) | (uint32_t(uint8_t(c))<<16) | (uint32_t(uint8_t(d))<<24))
+constexpr std::uint32_t FOURCC(char a, char b, char c, char d) noexcept
+{
+	return  (std::uint32_t(static_cast<std::uint8_t>(a))      ) |
+			(std::uint32_t(static_cast<std::uint8_t>(b)) <<  8) |
+			(std::uint32_t(static_cast<std::uint8_t>(c)) << 16) |
+			(std::uint32_t(static_cast<std::uint8_t>(d)) << 24);
+}
 
 class DdsFormat
 {

launcher/startGame/StartGameTab.cpp

@@ -187,12 +187,12 @@ void StartGameTab::refreshMods()
 	ui->buttonChroniclesHelp->setVisible(chroniclesMods.size() != chroniclesCount);
 
 #ifdef VCMI_ANDROID
-	bool hdInstalled = true; // TODO: HD import on android
+	bool canInstallHD = false; // TODO: HD import on android
 #else
-	bool hdInstalled = Helper::getMainWindow()->getModView()->isInstalledHd();
+	bool canInstallHD = !Helper::getMainWindow()->getModView()->isInstalledHd();
 #endif
-	ui->buttonInstallHdEdition->setVisible(!hdInstalled);
-	ui->buttonInstallHdEditionHelp->setVisible(!hdInstalled);
+	ui->buttonInstallHdEdition->setVisible(canInstallHD);
+	ui->buttonInstallHdEditionHelp->setVisible(canInstallHD);
 }
 
 void StartGameTab::refreshUpdateStatus(EGameUpdateStatus status)