Release 3.2.2

Warzone2100 · Dec 3, 2016 · e0a3674 · e0a3674
1 parent 59c9db8
commit e0a3674
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.56])
-AC_INIT([Warzone 2100],[master],[http://wz2100.net/],[warzone2100])
+AC_INIT([Warzone 2100],[3.2.2],[http://wz2100.net/],[warzone2100])
 
 AM_INIT_AUTOMAKE([1.11 tar-ustar no-dist-gzip dist-xz])
 
@@ -259,7 +259,7 @@ fi
 # Add later for stricter checking: -Wextra -Wmissing-declarations -Wstrict-prototypes
 AC_ARG_ENABLE([debug],
 	AS_HELP_STRING([--enable-debug[=yes/relaxed/profile/debugprofile/optimised/no]],[Compile debug version [[yes]]]),
-	[ enable_debug=${enableval} ], [ enable_debug=yes ])
+	[ enable_debug=${enableval} ], [ enable_debug=no ])
 AC_MSG_CHECKING([whether to compile in debug mode])
 AC_MSG_RESULT([${enable_debug}])
 

diff --git a/lib/framework/frame.h b/lib/framework/frame.h
@@ -69,11 +69,11 @@ typedef uint16_t PlayerMask;
 #endif
 
 #if defined(WZ_OS_WIN)
-# define WZ_WRITEDIR "Warzone 2100 master"
+# define WZ_WRITEDIR "Warzone 2100 3.2"
 #elif defined(WZ_OS_MAC)
-# define WZ_WRITEDIR "Warzone 2100 master"
+# define WZ_WRITEDIR "Warzone 2100 3.2"
 #else
-# define WZ_WRITEDIR ".warzone2100-master"
+# define WZ_WRITEDIR ".warzone2100-3.2"
 #endif
 
 enum QUEUE_MODE

diff --git a/lib/netplay/netplay.cpp b/lib/netplay/netplay.cpp
@@ -171,8 +171,8 @@ unsigned NET_PlayerConnectionStatus[CONNECTIONSTATUS_NORMAL][MAX_PLAYERS];
  ************************************************************************************
 **/
 static char const *versionString = version_getVersionString();
-static int NETCODE_VERSION_MAJOR = 0x1000;
-static int NETCODE_VERSION_MINOR = 0;
+static int NETCODE_VERSION_MAJOR = 0x30A0;
+static int NETCODE_VERSION_MINOR = 7;
 
 bool NETisCorrectVersion(uint32_t game_version_major, uint32_t game_version_minor)
 {

diff --git a/src/version.cpp b/src/version.cpp
@@ -37,7 +37,7 @@ static const char vcs_tag[] = VCS_TAG;
 */
 const char *version_getVersionString()
 {
-	static const char *version_string = nullptr;
+	static const char *version_string = "3.2.2";
 
 	if (version_string == NULL)
 	{

diff --git a/win32/warzone2100.rc b/win32/warzone2100.rc
@@ -4,8 +4,8 @@
 //
 
 1 VERSIONINFO
- FILEVERSION 9,9,9,9
- PRODUCTVERSION 9,9,9,9
+ FILEVERSION 3,2,2,0
+ PRODUCTVERSION 3,2,2,0
  FILEFLAGSMASK 0x0L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -22,12 +22,12 @@ BEGIN
 		BEGIN
 			VALUE "CompanyName", "Warzone 2100 Project"
 			VALUE "FileDescription", "Warzone 2100"
-			VALUE "FileVersion", "master"
+			VALUE "FileVersion", "3.2.2"
 			VALUE "InternalName", "Warzone 2100"
 			VALUE "LegalCopyright", "Copyright (C) 2005-2016 Warzone 2100 Project"
 			VALUE "OriginalFilename", "warzone2100.exe"
 			VALUE "ProductName", "Warzone 2100"
-			VALUE "ProductVersion", "master"
+			VALUE "ProductVersion", "3.2.2"
 		END
 	END
 	BLOCK "VarFileInfo"

diff --git a/win32/warzone2100_portable.rc b/win32/warzone2100_portable.rc
@@ -4,8 +4,8 @@
 //
 
 1 VERSIONINFO
- FILEVERSION 9,9,9,9
- PRODUCTVERSION 9,9,9,9
+ FILEVERSION 3,2,2,0
+ PRODUCTVERSION 3,2,2,0
  FILEFLAGSMASK 0x0L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -22,12 +22,12 @@ BEGIN
 		BEGIN
 			VALUE "CompanyName", "Warzone 2100 Project"
 			VALUE "FileDescription", "Warzone 2100 portable"
-			VALUE "FileVersion", "bugfixes"
+			VALUE "FileVersion", "3.2.2"
 			VALUE "InternalName", "Warzone 2100"
 			VALUE "LegalCopyright", "Copyright (C) 2005-2016 Warzone 2100 Project"
 			VALUE "OriginalFilename", "warzone2100_portable.exe"
 			VALUE "ProductName", "Warzone 2100 portable"
-			VALUE "ProductVersion", "bugfixes"
+			VALUE "ProductVersion", "3.2.2"
 		END
 	END
 	BLOCK "VarFileInfo"