Add support for 1.6

Author: patrikjuvonen

include/Diag.h

@@ -16,7 +16,7 @@
 
 #include "Common.h"
 
-#define CUR_MTA_VERSIONS 5 // beginning at 1; encompasses 1.1, 1.2, 1.3, 1.4, 1.5
+#define CUR_MTA_VERSIONS 6 // beginning at 1; encompasses 1.1, 1.2, 1.3, 1.4, 1.5, 1.6
 
 // MTA install path
 #define MTAPathValue	"Last Install Location"
@@ -25,6 +25,7 @@
 #define MTA13PathSubKey "SOFTWARE\\Multi Theft Auto: San Andreas All\\1.3"
 #define MTA14PathSubKey "SOFTWARE\\Multi Theft Auto: San Andreas All\\1.4"
 #define MTA15PathSubKey "SOFTWARE\\Multi Theft Auto: San Andreas All\\1.5"
+#define MTA16PathSubKey "SOFTWARE\\Multi Theft Auto: San Andreas All\\1.6"
 
 // GTA:SA path
 #define MTAGTAPathValue  "GTA:SA Path"
@@ -37,13 +38,15 @@
 #define MTA13VerSubKey "SOFTWARE\\Multi Theft Auto: San Andreas All\\1.3\\Settings\\general"
 #define MTA14VerSubKey "SOFTWARE\\Multi Theft Auto: San Andreas All\\1.4\\Settings\\general"
 #define MTA15VerSubKey "SOFTWARE\\Multi Theft Auto: San Andreas All\\1.5\\Settings\\general"
+#define MTA16VerSubKey "SOFTWARE\\Multi Theft Auto: San Andreas All\\1.6\\Settings\\general"
 
 // Nightly download URLs
 #define MTA11NightlyURL "https://nightly.mtasa.com/?mtasa-1.1.1-rc-latest"
 #define MTA12NightlyURL "https://nightly.mtasa.com/?mtasa-1.2-rc-latest"
 #define MTA13NightlyURL "https://nightly.mtasa.com/?mtasa-1.3.5-rc-latest"
 #define MTA14NightlyURL "https://nightly.mtasa.com/?mtasa-1.4.1-rc-latest"
 #define MTA15NightlyURL "https://nightly.mtasa.com/?mtasa-1.5-rc-latest"
+#define MTA16NightlyURL "https://nightly.mtasa.com/?mtasa-1.6-rc-latest"
 
 #define MTAVerURL "https://nightly.mtasa.com/ver/"
 

src/Diag.cpp

@@ -376,6 +376,7 @@ bool Diag::PollMTAVersions ( void )
 	MTAVersionsInstalled[3] = ReadRegKey ( MTAPathValue, MTA13PathSubKey ); // store MTA 1.3 path, if present
 	MTAVersionsInstalled[4] = ReadRegKey ( MTAPathValue, MTA14PathSubKey ); // store MTA 1.4 path, if present
 	MTAVersionsInstalled[5] = ReadRegKey ( MTAPathValue, MTA15PathSubKey ); // store MTA 1.5 path, if present
+	MTAVersionsInstalled[6] = ReadRegKey ( MTAPathValue, MTA16PathSubKey ); // store MTA 1.6 path, if present
 
 	// if a version isn't installed, "Failed to get key." is returned by ReadRegKey; clear that array element
 	for ( int i = 1; i <= CUR_MTA_VERSIONS; i++ )
@@ -466,6 +467,10 @@ std::string Diag::GetMTAPath ( void )
 		MTAPath = ReadRegKey ( MTAPathValue, MTA15PathSubKey );
 		return MTAPath;
 		break;
+	case 6:
+		MTAPath = ReadRegKey ( MTAPathValue, MTA16PathSubKey );
+		return MTAPath;
+		break;
 	}
 	return "Unable to read MTA path.";
 }
@@ -499,6 +504,11 @@ std::string Diag::GetMTAVersion ( void )
 		MTAShortVersion = "1.5";
 		return MTAVersion;
 		break;
+	case 6:
+		MTAVersion = ReadRegKey ( MTAVerValue, MTA16VerSubKey );
+		MTAShortVersion = "1.6";
+		return MTAVersion;
+		break;
 	}
 	return "Unable to read MTA version.";
 }
@@ -534,6 +544,9 @@ void Diag::UpdateMTA ( void )
 	case 5:
 		url = MTA15NightlyURL;
 		break;
+	case 6:
+		url = MTA16NightlyURL;
+		break;
 	}
 
 #ifndef SKIPUPDATE