Update version for 0.2.0

Frostshake · Nov 23, 2023 · 2fae9ca · 2fae9ca
1 parent 437e905
commit 2fae9ca
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 9 deletions.
diff --git a/WMVx/Build.h b/WMVx/Build.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define WMVX_BUILD "0.1.0"
+#define WMVX_BUILD "0.2.0"
diff --git a/WMVx/ClientChoiceDialog.cpp b/WMVx/ClientChoiceDialog.cpp
@@ -54,18 +54,36 @@ void ClientChoiceDialog::detectVersion() {
 	const auto detected = GameClientInfo::detect(ui.lineEditFolderName->text());
 
 	if (detected.has_value()) {
+		bool found = false;
 		auto index = 0;
-		for (const auto ver : availableVersions) {
-			if (ver == detected.value().version) {
+		const auto version = detected.value().version;
+
+		for (const auto& ver : availableVersions) {
+			if (ver == version) {
 				ui.comboBoxVersion->setCurrentIndex(index);
+				found = true;
 				break;
 			}
 			index++;
 		}
+
+		// if we cant get an exact match, try to use the closest instead.
+		if (!found) {
+			index = availableVersions.size() - 1;
+			for (auto it = availableVersions.crbegin(); it != availableVersions.crend(); ++it) {
+				if (version.major >= it->major) {
+					break;
+				}
+				index--;
+			}
+
+			ui.comboBoxVersion->setCurrentIndex(index);
+		}
+
 	}
 }
 
-const GameClientVersion ClientChoiceDialog::availableVersions[4] = {
+const std::array<GameClientVersion, 4> ClientChoiceDialog::availableVersions = {
 	GameClientVersion(1, 12, 1, 5875),
 	GameClientVersion(3,  3, 5, 12340),
 	GameClientVersion(8,  3, 7, 35435),

diff --git a/WMVx/ClientChoiceDialog.h b/WMVx/ClientChoiceDialog.h
@@ -21,5 +21,5 @@ class ClientChoiceDialog : public QDialog
 	void load();
 	void detectVersion();
 
-	static const core::GameClientVersion availableVersions[4];
+	static const std::array<core::GameClientVersion, 4> availableVersions;
 };
diff --git a/WMVx/WMVx.aps b/WMVx/WMVx.aps
diff --git a/WMVx/WMVx.rc b/WMVx/WMVx.rc
@@ -3,16 +3,16 @@ IDI_ICON1		ICON		DISCARDABLE	"WMVx.ico"
 #include <windows.h>
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION     0,1,0,0
-PRODUCTVERSION  0,1,0,0
+FILEVERSION     0,2,0,0
+PRODUCTVERSION  0,2,0,0
 BEGIN
 BLOCK "StringFileInfo"
 BEGIN
 BLOCK "040904E4"
 BEGIN
-VALUE "FileVersion", "0.1.0"
+VALUE "FileVersion", "0.2.0"
 VALUE "ProductName", "WMVx"
-VALUE "ProductVersion", "0.1.0"
+VALUE "ProductVersion", "0.2.0"
 END
 END
 END