Minor

Ian-Macallan · Jul 17, 2024 · 5bbe3e7 · 5bbe3e7
1 parent d03f55b
commit 5bbe3e7
Show file tree

Hide file tree

Showing 21 changed files with 308 additions and 147 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.2.9.12 # Version
+  BUILD_VERSION: 4.2.9.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,2,09,012
- PRODUCTVERSION 4,2,09,012
+ FILEVERSION 4,2,09,016
+ PRODUCTVERSION 4,2,09,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.2.09.012\0"
+            VALUE "FileVersion", "4.2.09.016\0"
             VALUE "InternalName", "https://www.macallan.org/\0"
-            VALUE "LegalCopyright", "Copyright (C) Tue Jul 16 12:24, 2024\0"
+            VALUE "LegalCopyright", "Copyright (C) Wed Jul 17 16:16, 2024\0"
             VALUE "LegalTrademarks", "Author: Ian Macallan\0"
             VALUE "OriginalFilename", ORIGINAL_FILENAME
-            VALUE "PrivateBuild", "797\0"
+            VALUE "PrivateBuild", "801\0"
             VALUE "ProductName", PRODUCT_NAME
-            VALUE "ProductVersion", "4.2.09.012\0"
-            VALUE "SpecialBuild", "797\0"
+            VALUE "ProductVersion", "4.2.09.016\0"
+            VALUE "SpecialBuild", "801\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.2.09.012\r\n(Build 797) - (x64 Unicode) (MSVC)\0"
+#define PRODUCT_NAME        L"Analyze - Version 4.2.09.016\r\n(Build 801) - (x64 Unicode) (MSVC)\0"
 #else
 #define ORIGINAL_FILENAME   "Analyze (x64 MBCS) (MSVC)\0"
-#define PRODUCT_NAME        "Analyze - Version 4.2.09.012\r\n(Build 797) - (x64 MBCS) (MSVC)\0"
+#define PRODUCT_NAME        "Analyze - Version 4.2.09.016\r\n(Build 801) - (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.2.09.012\r\n(Build 797) - (x86 Unicode) (MSVC)\0"
+#define PRODUCT_NAME        L"Analyze - Version 4.2.09.016\r\n(Build 801) - (x86 Unicode) (MSVC)\0"
 #else
 #define ORIGINAL_FILENAME   "Analyze (x86 MBCS) (MSVC)\0"
-#define PRODUCT_NAME        "Analyze - Version 4.2.09.012\r\n(Build 797) - (x86 MBCS) (MSVC)\0"
+#define PRODUCT_NAME        "Analyze - Version 4.2.09.016\r\n(Build 801) - (x86 MBCS) (MSVC)\0"
 #endif
 #else
 #define ORIGINAL_FILENAME   "Analyze (MSVC)\0"
-#define PRODUCT_NAME        "Analyze - Version 4.2.09.012\r\n(Build 797) - (MSVC)\0"
+#define PRODUCT_NAME        "Analyze - Version 4.2.09.016\r\n(Build 801) - (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 : 16/07/2024 12:24:47
+//	Generated : 17/07/2024 16:16:32
 //
 //===========================================================================================
 //
@@ -57,33 +57,33 @@
 #endif
 
 #ifdef UNICODE
-#define PROGRAM_DATE    L"Tue Jul 16 12:24"
-#define PROGRAM_DATE_F  L"Tue Jul 16 12:24 2024"
+#define PROGRAM_DATE    L"Wed Jul 17 16:16"
+#define PROGRAM_DATE_F  L"Wed Jul 17 16:16 2024"
 #define PROGRAM_YEAR    L"2024"
-#define PROGRAM_TIME    L"2024/07/16 12:24:47"
+#define PROGRAM_TIME    L"2024/07/17 16:16:32"
 #else
-#define PROGRAM_DATE    "Tue Jul 16 12:24"
-#define PROGRAM_DATE_F  "Tue Jul 16 12:24 2024"
+#define PROGRAM_DATE    "Wed Jul 17 16:16"
+#define PROGRAM_DATE_F  "Wed Jul 17 16:16 2024"
 #define PROGRAM_YEAR    "2024"
-#define PROGRAM_TIME    "2024/07/16 12:24:47"
+#define PROGRAM_TIME    "2024/07/17 16:16:32"
 #endif
 
 #ifdef UNICODE
-#define PROGRAM_VERSION L"4.2.09.012"
-#define PROGRAM_INSTALL L"4.2.09012"
-#define PROGRAM_VER_NUM 40209012
-#define PROGRAM_BUILD   L"797"
+#define PROGRAM_VERSION L"4.2.09.016"
+#define PROGRAM_INSTALL L"4.2.09016"
+#define PROGRAM_VER_NUM 40209016
+#define PROGRAM_BUILD   L"801"
 #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.2.09.012"
-#define PROGRAM_INSTALL "4.2.09012"
-#define PROGRAM_VER_NUM 40209012
-#define PROGRAM_BUILD   "797"
+#define PROGRAM_VERSION "4.2.09.016"
+#define PROGRAM_INSTALL "4.2.09016"
+#define PROGRAM_VER_NUM 40209016
+#define PROGRAM_BUILD   "801"
 #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.2.09.012\r\n(Build 932) - (x64 Unicode) (MSVC)\0"
+#define PRODUCT_NAME        L"TRCheatWin - Version 4.2.09.016\r\n(Build 936) - (x64 Unicode) (MSVC)\0"
 #else
 #define ORIGINAL_FILENAME   "TRCheatWin (x64 MBCS) (MSVC)\0"
-#define PRODUCT_NAME        "TRCheatWin - Version 4.2.09.012\r\n(Build 932) - (x64 MBCS) (MSVC)\0"
+#define PRODUCT_NAME        "TRCheatWin - Version 4.2.09.016\r\n(Build 936) - (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.2.09.012\r\n(Build 932) - (x86 Unicode) (MSVC)\0"
+#define PRODUCT_NAME        L"TRCheatWin - Version 4.2.09.016\r\n(Build 936) - (x86 Unicode) (MSVC)\0"
 #else
 #define ORIGINAL_FILENAME   "TRCheatWin (x86 MBCS) (MSVC)\0"
-#define PRODUCT_NAME        "TRCheatWin - Version 4.2.09.012\r\n(Build 932) - (x86 MBCS) (MSVC)\0"
+#define PRODUCT_NAME        "TRCheatWin - Version 4.2.09.016\r\n(Build 936) - (x86 MBCS) (MSVC)\0"
 #endif
 #else
 #define ORIGINAL_FILENAME   "TRCheatWin (MSVC)\0"
-#define PRODUCT_NAME        "TRCheatWin - Version 4.2.09.012\r\n(Build 932) - (MSVC)\0"
+#define PRODUCT_NAME        "TRCheatWin - Version 4.2.09.016\r\n(Build 936) - (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 : 16/07/2024 12:24:47
+//	Generated : 17/07/2024 16:16:33
 //
 //===========================================================================================
 //
@@ -57,33 +57,33 @@
 #endif
 
 #ifdef UNICODE
-#define PROGRAM_DATE    L"Tue Jul 16 12:24"
-#define PROGRAM_DATE_F  L"Tue Jul 16 12:24 2024"
+#define PROGRAM_DATE    L"Wed Jul 17 16:16"
+#define PROGRAM_DATE_F  L"Wed Jul 17 16:16 2024"
 #define PROGRAM_YEAR    L"2024"
-#define PROGRAM_TIME    L"2024/07/16 12:24:47"
+#define PROGRAM_TIME    L"2024/07/17 16:16:33"
 #else
-#define PROGRAM_DATE    "Tue Jul 16 12:24"
-#define PROGRAM_DATE_F  "Tue Jul 16 12:24 2024"
+#define PROGRAM_DATE    "Wed Jul 17 16:16"
+#define PROGRAM_DATE_F  "Wed Jul 17 16:16 2024"
 #define PROGRAM_YEAR    "2024"
-#define PROGRAM_TIME    "2024/07/16 12:24:47"
+#define PROGRAM_TIME    "2024/07/17 16:16:33"
 #endif
 
 #ifdef UNICODE
-#define PROGRAM_VERSION L"4.2.09.012"
-#define PROGRAM_INSTALL L"4.2.09012"
-#define PROGRAM_VER_NUM 40209012
-#define PROGRAM_BUILD   L"932"
+#define PROGRAM_VERSION L"4.2.09.016"
+#define PROGRAM_INSTALL L"4.2.09016"
+#define PROGRAM_VER_NUM 40209016
+#define PROGRAM_BUILD   L"936"
 #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.2.09.012"
-#define PROGRAM_INSTALL "4.2.09012"
-#define PROGRAM_VER_NUM 40209012
-#define PROGRAM_BUILD   "932"
+#define PROGRAM_VERSION "4.2.09.016"
+#define PROGRAM_INSTALL "4.2.09016"
+#define PROGRAM_VER_NUM 40209016
+#define PROGRAM_BUILD   "936"
 #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.2.9.12
+set PRODUCT_VERSION_VERS=4.2.9.16
 
 @exit /b
diff --git a/ProductVersionInfo.txt b/ProductVersionInfo.txt
@@ -1,4 +1,4 @@
-4.2.9.12
+4.2.9.16
 TRCheatWin
-TRCheatWin (x86) : Tue Jul 16 12:24 4.2.9.12
-TRCheatWin (x64) : Tue Jul 16 12:24 4.2.9.12
+TRCheatWin (x86) : Wed Jul 17 16:16 4.2.9.16
+TRCheatWin (x64) : Wed Jul 17 16:16 4.2.9.16
diff --git a/ProductVersionSize.txt b/ProductVersionSize.txt
@@ -1 +1 @@
-4.2.09.012
+4.2.09.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.2.09.012\r\n(Build 521) - (x64 Unicode) (MSVC)\0"
+#define PRODUCT_NAME        L"ReadTR2 - Version 4.2.09.016\r\n(Build 525) - (x64 Unicode) (MSVC)\0"
 #else
 #define ORIGINAL_FILENAME   "ReadTR2 (x64 MBCS) (MSVC)\0"
-#define PRODUCT_NAME        "ReadTR2 - Version 4.2.09.012\r\n(Build 521) - (x64 MBCS) (MSVC)\0"
+#define PRODUCT_NAME        "ReadTR2 - Version 4.2.09.016\r\n(Build 525) - (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.2.09.012\r\n(Build 521) - (x86 Unicode) (MSVC)\0"
+#define PRODUCT_NAME        L"ReadTR2 - Version 4.2.09.016\r\n(Build 525) - (x86 Unicode) (MSVC)\0"
 #else
 #define ORIGINAL_FILENAME   "ReadTR2 (x86 MBCS) (MSVC)\0"
-#define PRODUCT_NAME        "ReadTR2 - Version 4.2.09.012\r\n(Build 521) - (x86 MBCS) (MSVC)\0"
+#define PRODUCT_NAME        "ReadTR2 - Version 4.2.09.016\r\n(Build 525) - (x86 MBCS) (MSVC)\0"
 #endif
 #else
 #define ORIGINAL_FILENAME   "ReadTR2 (MSVC)\0"
-#define PRODUCT_NAME        "ReadTR2 - Version 4.2.09.012\r\n(Build 521) - (MSVC)\0"
+#define PRODUCT_NAME        "ReadTR2 - Version 4.2.09.016\r\n(Build 525) - (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 : 16/07/2024 12:24:47
+//	Generated : 17/07/2024 16:16:32
 //
 //===========================================================================================
 //
@@ -57,33 +57,33 @@
 #endif
 
 #ifdef UNICODE
-#define PROGRAM_DATE    L"Tue Jul 16 12:24"
-#define PROGRAM_DATE_F  L"Tue Jul 16 12:24 2024"
+#define PROGRAM_DATE    L"Wed Jul 17 16:16"
+#define PROGRAM_DATE_F  L"Wed Jul 17 16:16 2024"
 #define PROGRAM_YEAR    L"2024"
-#define PROGRAM_TIME    L"2024/07/16 12:24:47"
+#define PROGRAM_TIME    L"2024/07/17 16:16:33"
 #else
-#define PROGRAM_DATE    "Tue Jul 16 12:24"
-#define PROGRAM_DATE_F  "Tue Jul 16 12:24 2024"
+#define PROGRAM_DATE    "Wed Jul 17 16:16"
+#define PROGRAM_DATE_F  "Wed Jul 17 16:16 2024"
 #define PROGRAM_YEAR    "2024"
-#define PROGRAM_TIME    "2024/07/16 12:24:47"
+#define PROGRAM_TIME    "2024/07/17 16:16:33"
 #endif
 
 #ifdef UNICODE
-#define PROGRAM_VERSION L"4.2.09.012"
-#define PROGRAM_INSTALL L"4.2.09012"
-#define PROGRAM_VER_NUM 40209012
-#define PROGRAM_BUILD   L"521"
+#define PROGRAM_VERSION L"4.2.09.016"
+#define PROGRAM_INSTALL L"4.2.09016"
+#define PROGRAM_VER_NUM 40209016
+#define PROGRAM_BUILD   L"525"
 #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.2.09.012"
-#define PROGRAM_INSTALL "4.2.09012"
-#define PROGRAM_VER_NUM 40209012
-#define PROGRAM_BUILD   "521"
+#define PROGRAM_VERSION "4.2.09.016"
+#define PROGRAM_INSTALL "4.2.09016"
+#define PROGRAM_VER_NUM 40209016
+#define PROGRAM_BUILD   "525"
 #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,2,09,012
- PRODUCTVERSION 4,2,09,012
+ FILEVERSION 4,2,09,016
+ PRODUCTVERSION 4,2,09,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.2.09.012\0"
+            VALUE "FileVersion", "4.2.09.016\0"
             VALUE "InternalName", "https://www.macallan.org/\0"
-            VALUE "LegalCopyright", "Copyright (C) Tue Jul 16 12:24, 2024\0"
+            VALUE "LegalCopyright", "Copyright (C) Wed Jul 17 16:16, 2024\0"
             VALUE "LegalTrademarks", "Author: Ian Macallan\0"
             VALUE "OriginalFilename", ORIGINAL_FILENAME
-            VALUE "PrivateBuild", "521\0"
+            VALUE "PrivateBuild", "525\0"
             VALUE "ProductName", PRODUCT_NAME
-            VALUE "ProductVersion", "4.2.09.012\0"
-            VALUE "SpecialBuild", "521\0"
+            VALUE "ProductVersion", "4.2.09.016\0"
+            VALUE "SpecialBuild", "525\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/ReadTR2/ReadTRXScript.cpp b/ReadTR2/ReadTRXScript.cpp
@@ -1794,14 +1794,14 @@ static BOOL WriteHeader ( int version, int level, FCT_AddToItemsLabels function
             b = 1;
             if ( strlen(GlobalItemsTable [ b ].text) == 0 )
             {
-                strcpy_s ( GlobalItemsTable [ b ].text, sizeof(GlobalItemsTable [ b ].text), "Small Waterskin" );
+                strcpy_s ( GlobalItemsTable [ b ].text, sizeof(GlobalItemsTable [ b ].text), "Small Waterskin (1)\r\n3 Liters (4)\r\n" );
             }
 
             //
             b = 2;
             if ( strlen(GlobalItemsTable [ b ].text) == 0 )
             {
-                strcpy_s ( GlobalItemsTable [ b ].text, sizeof(GlobalItemsTable [ b ].text), "Large Waterskin" );
+                strcpy_s ( GlobalItemsTable [ b ].text, sizeof(GlobalItemsTable [ b ].text), "Large Waterskin (1)\r\n2 Liters (2)\r\n3 Liters (4)\r\n" );
             }
 
             //
@@ -1830,14 +1830,14 @@ static BOOL WriteHeader ( int version, int level, FCT_AddToItemsLabels function
             b = 1;
             if ( strlen(GlobalItemsTable [ b ].text) == 0 )
             {
-                strcpy_s ( GlobalItemsTable [ b ].text, sizeof(GlobalItemsTable [ b ].text), "\"Small Waterskin\"" );
+                strcpy_s ( GlobalItemsTable [ b ].text, sizeof(GlobalItemsTable [ b ].text), "\"Small Waterskin (1)\r\n3 Liters (4)\r\n\"" );
             }
 
             //
             b = 2;
             if ( strlen(GlobalItemsTable [ b ].text) == 0 )
             {
-                strcpy_s ( GlobalItemsTable [ b ].text, sizeof(GlobalItemsTable [ b ].text), "\"Large Waterskin\"" );
+                strcpy_s ( GlobalItemsTable [ b ].text, sizeof(GlobalItemsTable [ b ].text), "\"Large Waterskin (1)\r\n2 Liters (2)\r\n3 Liters (4)\r\n\"" );
             }
 
             //