Commit: 10af1739daa34a45cb0817adfdef4106b20c0634 - zandronum-macos-beta (hg)

This is a fork of Zandronum Beta for Mac Os (Silicon and Intel)

Commit MetaInfo

• Révision: 10af1739daa34a45cb0817adfdef4106b20c0634 (tree)
• l'heure: 2019-10-14 04:38:53
• Auteur: Benjamin Berkels <torr.samaho@quan...>
• Commiter: Benjamin Berkels

Message de Log

- changed the version string to 3.0.1
- kept network compatibility with 3.0

Change Summary

• modified: src/cl_main.cpp
• modified: src/sv_main.cpp
• modified: src/version.h

Modification

diff -r 6abf0a95b021 -r 10af1739daa3 src/cl_main.cpp
--- a/src/cl_main.cpp	Tue Sep 24 07:29:26 2019 +0100
+++ b/src/cl_main.cpp	Sun Oct 13 21:38:53 2019 +0200
@@ -818,7 +818,9 @@
 
 	 // Send connection signal to the server.
 	NETWORK_WriteByte( &g_LocalBuffer.ByteStream, CLCC_ATTEMPTCONNECTION );
-	NETWORK_WriteString( &g_LocalBuffer.ByteStream, DOTVERSIONSTR );
+	//NETWORK_WriteString( &g_LocalBuffer.ByteStream, DOTVERSIONSTR );
+	// [BB] Stay network compatible with 3.0.
+	NETWORK_WriteString( &g_LocalBuffer.ByteStream, "3.0" );
 	NETWORK_WriteString( &g_LocalBuffer.ByteStream, cl_password );
 	NETWORK_WriteByte( &g_LocalBuffer.ByteStream, cl_connect_flags );
 	NETWORK_WriteByte( &g_LocalBuffer.ByteStream, cl_hideaccount );

diff -r 6abf0a95b021 -r 10af1739daa3 src/sv_main.cpp
--- a/src/sv_main.cpp	Tue Sep 24 07:29:26 2019 +0100
+++ b/src/sv_main.cpp	Sun Oct 13 21:38:53 2019 +0200
@@ -1912,7 +1912,9 @@
 
 	{
 		// Make sure the version matches.
-		if ( stricmp( clientVersion.GetChars(), DOTVERSIONSTR ) != 0 )
+		// if ( stricmp( clientVersion.GetChars(), DOTVERSIONSTR ) != 0 )
+		// [BB] Stay network compatible with 3.0.
+		if ( stricmp( clientVersion.GetChars(), "3.0" ) != 0 )
 		{
 			SERVER_ClientError( lClient, NETWORK_ERRORCODE_WRONGVERSION );
 #ifdef CREATE_PACKET_LOG

diff -r 6abf0a95b021 -r 10af1739daa3 src/version.h
--- a/src/version.h	Tue Sep 24 07:29:26 2019 +0100
+++ b/src/version.h	Sun Oct 13 21:38:53 2019 +0200
@@ -46,7 +46,7 @@
 
 #define GAME_MAJOR_VERSION 3
 #define GAME_MINOR_VERSION 0
-#define GAMEVER_STRING "3.0"
+#define GAMEVER_STRING "3.0.1"
 #define DOTVERSIONSTR GAMEVER_STRING
 #define VERSIONSTR DOTVERSIONSTR
 
@@ -80,7 +80,9 @@
 // [BB] Use the revision number to automatically make builds from
 // different revisions incompatible. Skulltag only uses one byte
 // to transfer NETGAMEVERSION, so we need to limit its value to [0,255].
-#define NETGAMEVERSION (GetRevisionNumber() % 256)
+//#define NETGAMEVERSION (GetRevisionNumber() % 256)
+// [BB] Stay network compatible with 3.0.
+#define NETGAMEVERSION (1504266050 % 256)
 
 // Version stored in the ini's [LastRun] section.
 // Bump it if you made some configuration change that you want to