Set version to 1.7

botder · botder · commit 60094d17432e · 2025-07-31T02:28:47.000+02:00
diff --git a/Client/launch/Multi Theft Auto.manifest b/Client/launch/Multi Theft Auto.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:v3="urn:schemas-microsoft-com:asm.v3">
-    <assemblyIdentity type="win32" version="1.6.1.0" processorArchitecture="*" name="Multi Theft Auto" />
+    <assemblyIdentity type="win32" version="1.7.0.0" processorArchitecture="*" name="Multi Theft Auto" />
 
     <v3:application>
         <windowsSettings>
diff --git a/Client/launch/NEU/Multi Theft Auto.gdf.xml b/Client/launch/NEU/Multi Theft Auto.gdf.xml
@@ -32,7 +32,7 @@
             </Rating>
         </Ratings>
         <Version>
-            <VersionNumber versionNumber="1.6.1.0" />
+            <VersionNumber versionNumber="1.7.0.0" />
         </Version>
         <WindowsSystemPerformanceRating minimum="2.0" recommended="4.0" />
         <Developers>
diff --git a/Client/launch/launch.rc b/Client/launch/launch.rc
@@ -71,8 +71,8 @@ IDI_ICON1               ICON                    "resource\\mtaicon.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,6,1,0
- PRODUCTVERSION 1,6,1,0
+ FILEVERSION 1,7,0,0
+ PRODUCTVERSION 1,7,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -89,10 +89,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Multi Theft Auto"
             VALUE "FileDescription", "Multi Theft Auto Launcher"
-            VALUE "FileVersion", "1.6.1.0"
+            VALUE "FileVersion", "1.7.0.0"
             VALUE "LegalCopyright", "(C) 2003 - 2025 Multi Theft Auto"
             VALUE "ProductName", "MTA San Andreas"
-            VALUE "ProductVersion", "1.6.1.0"
+            VALUE "ProductVersion", "1.7.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Client/mods/deathmatch/CClient.cpp b/Client/mods/deathmatch/CClient.cpp
@@ -33,7 +33,8 @@ int CClient::ClientInitialize(const char* szArguments, CCoreInterface* pCore)
     // Make public client test builds expire
     if (GetDaysUntilExpire() < -1)
     {
-        MessageBox(NULL, _("This version has expired."), "MTA: San Andreas " MTA_DM_BUILDTAG_LONG + _E("CD64"), MB_OK | MB_ICONEXCLAMATION | MB_TOPMOST);
+        MessageBoxA(NULL, _("This version has expired."), SStringX("MTA: San Andreas " MTA_DM_BUILDTAG_LONG) + _E("CD64"),
+                    MB_OK | MB_ICONEXCLAMATION | MB_TOPMOST);
         TerminateProcess(GetCurrentProcess(), 1);
     }
 #endif
diff --git a/Client/mods/deathmatch/logic/CClientGame.cpp b/Client/mods/deathmatch/logic/CClientGame.cpp
@@ -703,6 +703,10 @@ bool CClientGame::StartGame(const char* szNick, const char* szPassword, eServerT
             pBitStream->Write(strTemp.c_str(), MAX_PLAYER_NICK_LENGTH);
             pBitStream->Write(reinterpret_cast<const char*>(Password.data), sizeof(MD5));
 
+            // Append community information (removed, but we keep this to retain protocol compat)
+            std::string strUser;
+            pBitStream->Write(strUser.c_str(), MAX_SERIAL_LENGTH);
+
             // Send the packet as joindata
             g_pNet->SendPacket(PACKET_ID_PLAYER_JOINDATA, pBitStream, PACKET_PRIORITY_HIGH, PACKET_RELIABILITY_RELIABLE_ORDERED);
             g_pNet->DeallocateNetBitStream(pBitStream);
diff --git a/Server/mods/deathmatch/logic/CGame.cpp b/Server/mods/deathmatch/logic/CGame.cpp
@@ -78,7 +78,7 @@
 #define MAX_EXPLOSION_SYNC_DISTANCE  400.0f
 #define MAX_PROJECTILE_SYNC_DISTANCE 400.0f
 
-#define RELEASE_MIN_CLIENT_VERSION "1.6.1-0.00000"
+#define RELEASE_MIN_CLIENT_VERSION "1.7.0-0.00000"
 
 #define DEFAULT_GRAVITY              0.008f
 #define DEFAULT_GAME_SPEED           1.0f
diff --git a/Server/mods/deathmatch/logic/CResourceChecker.Data.h b/Server/mods/deathmatch/logic/CResourceChecker.Data.h
@@ -23,13 +23,13 @@ namespace
     };
 
     SVersionItem clientFunctionInitList[] = {
-        // Features added in 1.6.1
-        // {"name", "1.6.1-9.bbbbb"},
+        // Features added in 1.7.0
+        // {"name", "1.7.0-9.bbbbb"},
     };
 
     SVersionItem serverFunctionInitList[] = {
-        // Features added in 1.6.1
-        // {"name", "1.6.1-9.bbbbb"},
+        // Features added in 1.7.0
+        // {"name", "1.7.0-9.bbbbb"},
     };
 #endif
 
diff --git a/Shared/data/MTA San Andreas/MTA/cgui/images/version.png b/Shared/data/MTA San Andreas/MTA/cgui/images/version.png
diff --git a/Shared/data/data files installer.nsi b/Shared/data/data files installer.nsi
@@ -16,8 +16,8 @@ Var Install_Dir
 
 !ifndef MAJOR_VER
     !define MAJOR_VER "1"
-    !define MINOR_VER "6"
-    !define MAINT_VER "1"
+    !define MINOR_VER "7"
+    !define MAINT_VER "0"
 !endif
 !define 0.0 "${MAJOR_VER}.${MINOR_VER}"
 !define 0.0.0 "${MAJOR_VER}.${MINOR_VER}.${MAINT_VER}"
diff --git a/Shared/installer/nightly.nsi b/Shared/installer/nightly.nsi
@@ -56,8 +56,8 @@ Var UninstallExePath
 
 !ifndef MAJOR_VER
     !define MAJOR_VER "1"
-    !define MINOR_VER "6"
-    !define MAINT_VER "1"
+    !define MINOR_VER "7"
+    !define MAINT_VER "0"
 !endif
 !define 0.0 "${MAJOR_VER}.${MINOR_VER}"
 !define 0.0.0 "${MAJOR_VER}.${MINOR_VER}.${MAINT_VER}"
diff --git a/Shared/sdk/version.h b/Shared/sdk/version.h
@@ -43,8 +43,8 @@
 
 // New version info
 #define MTASA_VERSION_MAJOR         1
-#define MTASA_VERSION_MINOR         6
-#define MTASA_VERSION_MAINTENANCE   1
+#define MTASA_VERSION_MINOR         7
+#define MTASA_VERSION_MAINTENANCE   0
 #define MTASA_VERSION_TYPE          VERSION_TYPE_CUSTOM
 #define MTASA_VERSION_BUILD         0
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,8 @@ int CClient::ClientInitialize(const char* szArguments, CCoreInterface* pCore)`
`33`	`33`	`// Make public client test builds expire`
`34`	`34`	`if (GetDaysUntilExpire() < -1)`
`35`	`35`	`{`
`36`		`- MessageBox(NULL, _("This version has expired."), "MTA: San Andreas " MTA_DM_BUILDTAG_LONG + _E("CD64"), MB_OK \| MB_ICONEXCLAMATION \| MB_TOPMOST);`
	`36`	`+ MessageBoxA(NULL, _("This version has expired."), SStringX("MTA: San Andreas " MTA_DM_BUILDTAG_LONG) + _E("CD64"),`
	`37`	`+ MB_OK \| MB_ICONEXCLAMATION \| MB_TOPMOST);`
`37`	`38`	`TerminateProcess(GetCurrentProcess(), 1);`
`38`	`39`	`}`
`39`	`40`	`#endif`