Minor

Ian-Macallan · May 31, 2024 · b06148f · b06148f
1 parent 43c07cc
commit b06148f
Show file tree

Hide file tree

Showing 25 changed files with 276 additions and 281 deletions.
diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
@@ -25,7 +25,7 @@ env:
   # You can convert this to a build matrix if you need coverage of multiple configuration types.
   # https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
   BUILD_CONFIGURATION: Release
-  BUILD_VERSION: 4.1.10.14 # Version
+  BUILD_VERSION: 4.1.10.16 # Version
 #
 permissions: 
   actions: write

diff --git a/Analyze/Analyze.rc b/Analyze/Analyze.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,1,10,014
- PRODUCTVERSION 4,1,10,014
+ FILEVERSION 4,1,10,016
+ PRODUCTVERSION 4,1,10,016
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -70,15 +70,15 @@ BEGIN
             VALUE "Comments", "mailto:ian.macallan@gmail.com\0"
             VALUE "CompanyName", "Macallan (c)\0"
             VALUE "FileDescription", "Analyze - (MSVC)\0"
-            VALUE "FileVersion", "4.1.10.014\0"
+            VALUE "FileVersion", "4.1.10.016\0"
             VALUE "InternalName", "https://www.macallan.org/\0"
-            VALUE "LegalCopyright", "Copyright (C) Thu May 30 16:44, 2024\0"
+            VALUE "LegalCopyright", "Copyright (C) Fri May 31 09:42, 2024\0"
             VALUE "LegalTrademarks", "Author: Ian Macallan\0"
             VALUE "OriginalFilename", ORIGINAL_FILENAME
-            VALUE "PrivateBuild", "646\0"
+            VALUE "PrivateBuild", "648\0"
             VALUE "ProductName", PRODUCT_NAME
-            VALUE "ProductVersion", "4.1.10.014\0"
-            VALUE "SpecialBuild", "646\0"
+            VALUE "ProductVersion", "4.1.10.016\0"
+            VALUE "SpecialBuild", "648\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Analyze/AutomaticProductName.h b/Analyze/AutomaticProductName.h
@@ -6,22 +6,22 @@
 #ifdef _WIN64
 #ifdef UNICODE
 #define ORIGINAL_FILENAME   L"Analyze (x64 Unicode) (MSVC)\0"
-#define PRODUCT_NAME        L"Analyze - Version 4.1.10.014\r\n(Build 646) - (x64 Unicode) (MSVC)\0"
+#define PRODUCT_NAME        L"Analyze - Version 4.1.10.016\r\n(Build 648) - (x64 Unicode) (MSVC)\0"
 #else
 #define ORIGINAL_FILENAME   "Analyze (x64 MBCS) (MSVC)\0"
-#define PRODUCT_NAME        "Analyze - Version 4.1.10.014\r\n(Build 646) - (x64 MBCS) (MSVC)\0"
+#define PRODUCT_NAME        "Analyze - Version 4.1.10.016\r\n(Build 648) - (x64 MBCS) (MSVC)\0"
 #endif
 #elif _WIN32
 #ifdef UNICODE
 #define ORIGINAL_FILENAME   L"Analyze (x86 Unicode) (MSVC)\0"
-#define PRODUCT_NAME        L"Analyze - Version 4.1.10.014\r\n(Build 646) - (x86 Unicode) (MSVC)\0"
+#define PRODUCT_NAME        L"Analyze - Version 4.1.10.016\r\n(Build 648) - (x86 Unicode) (MSVC)\0"
 #else
 #define ORIGINAL_FILENAME   "Analyze (x86 MBCS) (MSVC)\0"
-#define PRODUCT_NAME        "Analyze - Version 4.1.10.014\r\n(Build 646) - (x86 MBCS) (MSVC)\0"
+#define PRODUCT_NAME        "Analyze - Version 4.1.10.016\r\n(Build 648) - (x86 MBCS) (MSVC)\0"
 #endif
 #else
 #define ORIGINAL_FILENAME   "Analyze (MSVC)\0"
-#define PRODUCT_NAME        "Analyze - Version 4.1.10.014\r\n(Build 646) - (MSVC)\0"
+#define PRODUCT_NAME        "Analyze - Version 4.1.10.016\r\n(Build 648) - (MSVC)\0"
 #endif
 
 #endif
diff --git a/Analyze/AutomaticVersionHeader.h b/Analyze/AutomaticVersionHeader.h
@@ -5,7 +5,7 @@
 //
 //	(c) 2003 - 2024 Macallan - mailto:ian.macallan@gmail.com
 //
-//	Generated : 30/05/2024 16:44:34
+//	Generated : 31/05/2024 09:42:49
 //
 //===========================================================================================
 //
@@ -57,33 +57,33 @@
 #endif
 
 #ifdef UNICODE
-#define PROGRAM_DATE    L"Thu May 30 16:44"
-#define PROGRAM_DATE_F  L"Thu May 30 16:44 2024"
+#define PROGRAM_DATE    L"Fri May 31 09:42"
+#define PROGRAM_DATE_F  L"Fri May 31 09:42 2024"
 #define PROGRAM_YEAR    L"2024"
-#define PROGRAM_TIME    L"2024/05/30 16:44:34"
+#define PROGRAM_TIME    L"2024/05/31 09:42:49"
 #else
-#define PROGRAM_DATE    "Thu May 30 16:44"
-#define PROGRAM_DATE_F  "Thu May 30 16:44 2024"
+#define PROGRAM_DATE    "Fri May 31 09:42"
+#define PROGRAM_DATE_F  "Fri May 31 09:42 2024"
 #define PROGRAM_YEAR    "2024"
-#define PROGRAM_TIME    "2024/05/30 16:44:34"
+#define PROGRAM_TIME    "2024/05/31 09:42:49"
 #endif
 
 #ifdef UNICODE
-#define PROGRAM_VERSION L"4.1.10.014"
-#define PROGRAM_INSTALL L"4.1.10014"
-#define PROGRAM_VER_NUM 40110014
-#define PROGRAM_BUILD   L"646"
+#define PROGRAM_VERSION L"4.1.10.016"
+#define PROGRAM_INSTALL L"4.1.10016"
+#define PROGRAM_VER_NUM 40110016
+#define PROGRAM_BUILD   L"648"
 #define PROGRAM_TITLE   L"Analyze"
 #ifdef _WIN64
 #define PROGRAM_TITLE_P L"Analyze (x64 Unicode)"
 #else
 #define PROGRAM_TITLE_P L"Analyze (x86 Unicode)"
 #endif
 #else
-#define PROGRAM_VERSION "4.1.10.014"
-#define PROGRAM_INSTALL "4.1.10014"
-#define PROGRAM_VER_NUM 40110014
-#define PROGRAM_BUILD   "646"
+#define PROGRAM_VERSION "4.1.10.016"
+#define PROGRAM_INSTALL "4.1.10016"
+#define PROGRAM_VER_NUM 40110016
+#define PROGRAM_BUILD   "648"
 #define PROGRAM_TITLE   "Analyze"
 #ifdef _WIN64
 #define PROGRAM_TITLE_P "Analyze (x64 MBCS)"

diff --git a/AutomaticProductName.h b/AutomaticProductName.h
@@ -6,22 +6,22 @@
 #ifdef _WIN64
 #ifdef UNICODE
 #define ORIGINAL_FILENAME   L"TRCheatWin (x64 Unicode) (MSVC)\0"
-#define PRODUCT_NAME        L"TRCheatWin - Version 4.1.10.014\r\n(Build 781) - (x64 Unicode) (MSVC)\0"
+#define PRODUCT_NAME        L"TRCheatWin - Version 4.1.10.016\r\n(Build 783) - (x64 Unicode) (MSVC)\0"
 #else
 #define ORIGINAL_FILENAME   "TRCheatWin (x64 MBCS) (MSVC)\0"
-#define PRODUCT_NAME        "TRCheatWin - Version 4.1.10.014\r\n(Build 781) - (x64 MBCS) (MSVC)\0"
+#define PRODUCT_NAME        "TRCheatWin - Version 4.1.10.016\r\n(Build 783) - (x64 MBCS) (MSVC)\0"
 #endif
 #elif _WIN32
 #ifdef UNICODE
 #define ORIGINAL_FILENAME   L"TRCheatWin (x86 Unicode) (MSVC)\0"
-#define PRODUCT_NAME        L"TRCheatWin - Version 4.1.10.014\r\n(Build 781) - (x86 Unicode) (MSVC)\0"
+#define PRODUCT_NAME        L"TRCheatWin - Version 4.1.10.016\r\n(Build 783) - (x86 Unicode) (MSVC)\0"
 #else
 #define ORIGINAL_FILENAME   "TRCheatWin (x86 MBCS) (MSVC)\0"
-#define PRODUCT_NAME        "TRCheatWin - Version 4.1.10.014\r\n(Build 781) - (x86 MBCS) (MSVC)\0"
+#define PRODUCT_NAME        "TRCheatWin - Version 4.1.10.016\r\n(Build 783) - (x86 MBCS) (MSVC)\0"
 #endif
 #else
 #define ORIGINAL_FILENAME   "TRCheatWin (MSVC)\0"
-#define PRODUCT_NAME        "TRCheatWin - Version 4.1.10.014\r\n(Build 781) - (MSVC)\0"
+#define PRODUCT_NAME        "TRCheatWin - Version 4.1.10.016\r\n(Build 783) - (MSVC)\0"
 #endif
 
 #endif
diff --git a/AutomaticVersionHeader.h b/AutomaticVersionHeader.h
@@ -5,7 +5,7 @@
 //
 //	(c) 2003 - 2024 Macallan - mailto:ian.macallan@gmail.com
 //
-//	Generated : 30/05/2024 16:44:34
+//	Generated : 31/05/2024 09:42:49
 //
 //===========================================================================================
 //
@@ -57,33 +57,33 @@
 #endif
 
 #ifdef UNICODE
-#define PROGRAM_DATE    L"Thu May 30 16:44"
-#define PROGRAM_DATE_F  L"Thu May 30 16:44 2024"
+#define PROGRAM_DATE    L"Fri May 31 09:42"
+#define PROGRAM_DATE_F  L"Fri May 31 09:42 2024"
 #define PROGRAM_YEAR    L"2024"
-#define PROGRAM_TIME    L"2024/05/30 16:44:34"
+#define PROGRAM_TIME    L"2024/05/31 09:42:49"
 #else
-#define PROGRAM_DATE    "Thu May 30 16:44"
-#define PROGRAM_DATE_F  "Thu May 30 16:44 2024"
+#define PROGRAM_DATE    "Fri May 31 09:42"
+#define PROGRAM_DATE_F  "Fri May 31 09:42 2024"
 #define PROGRAM_YEAR    "2024"
-#define PROGRAM_TIME    "2024/05/30 16:44:34"
+#define PROGRAM_TIME    "2024/05/31 09:42:49"
 #endif
 
 #ifdef UNICODE
-#define PROGRAM_VERSION L"4.1.10.014"
-#define PROGRAM_INSTALL L"4.1.10014"
-#define PROGRAM_VER_NUM 40110014
-#define PROGRAM_BUILD   L"781"
+#define PROGRAM_VERSION L"4.1.10.016"
+#define PROGRAM_INSTALL L"4.1.10016"
+#define PROGRAM_VER_NUM 40110016
+#define PROGRAM_BUILD   L"783"
 #define PROGRAM_TITLE   L"TRCheat Win"
 #ifdef _WIN64
 #define PROGRAM_TITLE_P L"TRCheat Win (x64 Unicode)"
 #else
 #define PROGRAM_TITLE_P L"TRCheat Win (x86 Unicode)"
 #endif
 #else
-#define PROGRAM_VERSION "4.1.10.014"
-#define PROGRAM_INSTALL "4.1.10014"
-#define PROGRAM_VER_NUM 40110014
-#define PROGRAM_BUILD   "781"
+#define PROGRAM_VERSION "4.1.10.016"
+#define PROGRAM_INSTALL "4.1.10016"
+#define PROGRAM_VER_NUM 40110016
+#define PROGRAM_BUILD   "783"
 #define PROGRAM_TITLE   "TRCheat Win"
 #ifdef _WIN64
 #define PROGRAM_TITLE_P "TRCheat Win (x64 MBCS)"

diff --git a/ProductVersionInfo.cmd b/ProductVersionInfo.cmd
@@ -3,6 +3,6 @@
 rem cd %~dp0
 rem %~d0
 
-set PRODUCT_VERSION_VERS=4.1.10.14
+set PRODUCT_VERSION_VERS=4.1.10.16
 
 @exit /b
diff --git a/ProductVersionInfo.txt b/ProductVersionInfo.txt
@@ -1,4 +1,4 @@
-4.1.10.14
+4.1.10.16
 TRCheatWin
-TRCheatWin (x86) : Thu May 30 16:44 4.1.10.14
-TRCheatWin (x64) : Thu May 30 16:44 4.1.10.14
+TRCheatWin (x86) : Fri May 31 09:42 4.1.10.16
+TRCheatWin (x64) : Fri May 31 09:42 4.1.10.16
diff --git a/ProductVersionSize.txt b/ProductVersionSize.txt
@@ -1 +1 @@
-4.1.10.014
+4.1.10.016
diff --git a/ReadTR2/AutomaticProductName.h b/ReadTR2/AutomaticProductName.h
@@ -6,22 +6,22 @@
 #ifdef _WIN64
 #ifdef UNICODE
 #define ORIGINAL_FILENAME   L"ReadTR2 (x64 Unicode) (MSVC)\0"
-#define PRODUCT_NAME        L"ReadTR2 - Version 4.1.10.014\r\n(Build 370) - (x64 Unicode) (MSVC)\0"
+#define PRODUCT_NAME        L"ReadTR2 - Version 4.1.10.016\r\n(Build 372) - (x64 Unicode) (MSVC)\0"
 #else
 #define ORIGINAL_FILENAME   "ReadTR2 (x64 MBCS) (MSVC)\0"
-#define PRODUCT_NAME        "ReadTR2 - Version 4.1.10.014\r\n(Build 370) - (x64 MBCS) (MSVC)\0"
+#define PRODUCT_NAME        "ReadTR2 - Version 4.1.10.016\r\n(Build 372) - (x64 MBCS) (MSVC)\0"
 #endif
 #elif _WIN32
 #ifdef UNICODE
 #define ORIGINAL_FILENAME   L"ReadTR2 (x86 Unicode) (MSVC)\0"
-#define PRODUCT_NAME        L"ReadTR2 - Version 4.1.10.014\r\n(Build 370) - (x86 Unicode) (MSVC)\0"
+#define PRODUCT_NAME        L"ReadTR2 - Version 4.1.10.016\r\n(Build 372) - (x86 Unicode) (MSVC)\0"
 #else
 #define ORIGINAL_FILENAME   "ReadTR2 (x86 MBCS) (MSVC)\0"
-#define PRODUCT_NAME        "ReadTR2 - Version 4.1.10.014\r\n(Build 370) - (x86 MBCS) (MSVC)\0"
+#define PRODUCT_NAME        "ReadTR2 - Version 4.1.10.016\r\n(Build 372) - (x86 MBCS) (MSVC)\0"
 #endif
 #else
 #define ORIGINAL_FILENAME   "ReadTR2 (MSVC)\0"
-#define PRODUCT_NAME        "ReadTR2 - Version 4.1.10.014\r\n(Build 370) - (MSVC)\0"
+#define PRODUCT_NAME        "ReadTR2 - Version 4.1.10.016\r\n(Build 372) - (MSVC)\0"
 #endif
 
 #endif
diff --git a/ReadTR2/AutomaticVersionHeader.h b/ReadTR2/AutomaticVersionHeader.h
@@ -5,7 +5,7 @@
 //
 //	(c) 2003 - 2024 Macallan - mailto:ian.macallan@gmail.com
 //
-//	Generated : 30/05/2024 16:44:34
+//	Generated : 31/05/2024 09:42:49
 //
 //===========================================================================================
 //
@@ -57,33 +57,33 @@
 #endif
 
 #ifdef UNICODE
-#define PROGRAM_DATE    L"Thu May 30 16:44"
-#define PROGRAM_DATE_F  L"Thu May 30 16:44 2024"
+#define PROGRAM_DATE    L"Fri May 31 09:42"
+#define PROGRAM_DATE_F  L"Fri May 31 09:42 2024"
 #define PROGRAM_YEAR    L"2024"
-#define PROGRAM_TIME    L"2024/05/30 16:44:34"
+#define PROGRAM_TIME    L"2024/05/31 09:42:49"
 #else
-#define PROGRAM_DATE    "Thu May 30 16:44"
-#define PROGRAM_DATE_F  "Thu May 30 16:44 2024"
+#define PROGRAM_DATE    "Fri May 31 09:42"
+#define PROGRAM_DATE_F  "Fri May 31 09:42 2024"
 #define PROGRAM_YEAR    "2024"
-#define PROGRAM_TIME    "2024/05/30 16:44:34"
+#define PROGRAM_TIME    "2024/05/31 09:42:49"
 #endif
 
 #ifdef UNICODE
-#define PROGRAM_VERSION L"4.1.10.014"
-#define PROGRAM_INSTALL L"4.1.10014"
-#define PROGRAM_VER_NUM 40110014
-#define PROGRAM_BUILD   L"370"
+#define PROGRAM_VERSION L"4.1.10.016"
+#define PROGRAM_INSTALL L"4.1.10016"
+#define PROGRAM_VER_NUM 40110016
+#define PROGRAM_BUILD   L"372"
 #define PROGRAM_TITLE   L"Read TR2"
 #ifdef _WIN64
 #define PROGRAM_TITLE_P L"Read TR2 (x64 Unicode)"
 #else
 #define PROGRAM_TITLE_P L"Read TR2 (x86 Unicode)"
 #endif
 #else
-#define PROGRAM_VERSION "4.1.10.014"
-#define PROGRAM_INSTALL "4.1.10014"
-#define PROGRAM_VER_NUM 40110014
-#define PROGRAM_BUILD   "370"
+#define PROGRAM_VERSION "4.1.10.016"
+#define PROGRAM_INSTALL "4.1.10016"
+#define PROGRAM_VER_NUM 40110016
+#define PROGRAM_BUILD   "372"
 #define PROGRAM_TITLE   "Read TR2"
 #ifdef _WIN64
 #define PROGRAM_TITLE_P "Read TR2 (x64 MBCS)"

diff --git a/ReadTR2/ReadTR2.rc b/ReadTR2/ReadTR2.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,1,10,014
- PRODUCTVERSION 4,1,10,014
+ FILEVERSION 4,1,10,016
+ PRODUCTVERSION 4,1,10,016
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -70,15 +70,15 @@ BEGIN
             VALUE "Comments", "mailto:ian.macallan@gmail.com\0"
             VALUE "CompanyName", "Macallan (c)\0"
             VALUE "FileDescription", "ReadTR2 - (MSVC)\0"
-            VALUE "FileVersion", "4.1.10.014\0"
+            VALUE "FileVersion", "4.1.10.016\0"
             VALUE "InternalName", "https://www.macallan.org/\0"
-            VALUE "LegalCopyright", "Copyright (C) Thu May 30 16:44, 2024\0"
+            VALUE "LegalCopyright", "Copyright (C) Fri May 31 09:42, 2024\0"
             VALUE "LegalTrademarks", "Author: Ian Macallan\0"
             VALUE "OriginalFilename", ORIGINAL_FILENAME
-            VALUE "PrivateBuild", "370\0"
+            VALUE "PrivateBuild", "372\0"
             VALUE "ProductName", PRODUCT_NAME
-            VALUE "ProductVersion", "4.1.10.014\0"
-            VALUE "SpecialBuild", "370\0"
+            VALUE "ProductVersion", "4.1.10.016\0"
+            VALUE "SpecialBuild", "372\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/TR4NGSaveGame.cpp b/TR4NGSaveGame.cpp
@@ -83,6 +83,7 @@ CTR4NGSaveGame::CTR4NGSaveGame()
 {
 
     m_iVersion          = 49;
+    m_iSubVersion       = 9,
 
     m_iSaveLength       = CTRXGlobal::m_iMaxNGSize;
     m_iMaxLevel         = TR4NGMAXLEVEL;
@@ -107,7 +108,6 @@ CTR4NGSaveGame::CTR4NGSaveGame()
     m_pBufferBackup     = new ( TR4NGSAVE );
     ZeroMemory ( m_pBufferBackup, sizeof(TR4NGSAVE) );
 
-    m_iSubVersion       = 0;
 }
 
 //
@@ -336,7 +336,7 @@ void CTR4NGSaveGame::RetrieveInformation( const char *pFilename )
     if ( ReadSavegame ( pFilename ) )
     {
         RetrieveHeader ( );
-        m_iSubVersion   = 0;
+        m_iSubVersion   = 9;
     }
 }