Minor

Ian-Macallan · Aug 8, 2024 · d67bd4e · d67bd4e
1 parent f7a87f5
commit d67bd4e
Show file tree

Hide file tree

Showing 23 changed files with 1,041 additions and 351 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.3.1.3 # Version
+  BUILD_VERSION: 4.3.5.7 # 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,3,01,003
- PRODUCTVERSION 4,3,01,003
+ FILEVERSION 4,3,05,007
+ PRODUCTVERSION 4,3,05,007
  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.3.01.003\0"
+            VALUE "FileVersion", "4.3.05.007\0"
             VALUE "InternalName", "https://www.macallan.org/\0"
-            VALUE "LegalCopyright", "Copyright (C) Fri Aug 02 15:43, 2024\0"
+            VALUE "LegalCopyright", "Copyright (C) Thu Aug 08 09:11, 2024\0"
             VALUE "LegalTrademarks", "Author: Ian Macallan\0"
             VALUE "OriginalFilename", ORIGINAL_FILENAME
-            VALUE "PrivateBuild", "841\0"
+            VALUE "PrivateBuild", "854\0"
             VALUE "ProductName", PRODUCT_NAME
-            VALUE "ProductVersion", "4.3.01.003\0"
-            VALUE "SpecialBuild", "841\0"
+            VALUE "ProductVersion", "4.3.05.007\0"
+            VALUE "SpecialBuild", "854\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.3.01.003\r\n(Build 841) - (x64 Unicode) (MSVC)\0"
+#define PRODUCT_NAME        L"Analyze - Version 4.3.05.007\r\n(Build 854) - (x64 Unicode) (MSVC)\0"
 #else
 #define ORIGINAL_FILENAME   "Analyze (x64 MBCS) (MSVC)\0"
-#define PRODUCT_NAME        "Analyze - Version 4.3.01.003\r\n(Build 841) - (x64 MBCS) (MSVC)\0"
+#define PRODUCT_NAME        "Analyze - Version 4.3.05.007\r\n(Build 854) - (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.3.01.003\r\n(Build 841) - (x86 Unicode) (MSVC)\0"
+#define PRODUCT_NAME        L"Analyze - Version 4.3.05.007\r\n(Build 854) - (x86 Unicode) (MSVC)\0"
 #else
 #define ORIGINAL_FILENAME   "Analyze (x86 MBCS) (MSVC)\0"
-#define PRODUCT_NAME        "Analyze - Version 4.3.01.003\r\n(Build 841) - (x86 MBCS) (MSVC)\0"
+#define PRODUCT_NAME        "Analyze - Version 4.3.05.007\r\n(Build 854) - (x86 MBCS) (MSVC)\0"
 #endif
 #else
 #define ORIGINAL_FILENAME   "Analyze (MSVC)\0"
-#define PRODUCT_NAME        "Analyze - Version 4.3.01.003\r\n(Build 841) - (MSVC)\0"
+#define PRODUCT_NAME        "Analyze - Version 4.3.05.007\r\n(Build 854) - (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 : 02/08/2024 15:43:01
+//	Generated : 08/08/2024 09:11:38
 //
 //===========================================================================================
 //
@@ -57,33 +57,33 @@
 #endif
 
 #ifdef UNICODE
-#define PROGRAM_DATE    L"Fri Aug 02 15:43"
-#define PROGRAM_DATE_F  L"Fri Aug 02 15:43 2024"
+#define PROGRAM_DATE    L"Thu Aug 08 09:11"
+#define PROGRAM_DATE_F  L"Thu Aug 08 09:11 2024"
 #define PROGRAM_YEAR    L"2024"
-#define PROGRAM_TIME    L"2024/08/02 15:43:01"
+#define PROGRAM_TIME    L"2024/08/08 09:11:38"
 #else
-#define PROGRAM_DATE    "Fri Aug 02 15:43"
-#define PROGRAM_DATE_F  "Fri Aug 02 15:43 2024"
+#define PROGRAM_DATE    "Thu Aug 08 09:11"
+#define PROGRAM_DATE_F  "Thu Aug 08 09:11 2024"
 #define PROGRAM_YEAR    "2024"
-#define PROGRAM_TIME    "2024/08/02 15:43:01"
+#define PROGRAM_TIME    "2024/08/08 09:11:38"
 #endif
 
 #ifdef UNICODE
-#define PROGRAM_VERSION L"4.3.01.003"
-#define PROGRAM_INSTALL L"4.3.01003"
-#define PROGRAM_VER_NUM 40301003
-#define PROGRAM_BUILD   L"841"
+#define PROGRAM_VERSION L"4.3.05.007"
+#define PROGRAM_INSTALL L"4.3.05007"
+#define PROGRAM_VER_NUM 40305007
+#define PROGRAM_BUILD   L"854"
 #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.3.01.003"
-#define PROGRAM_INSTALL "4.3.01003"
-#define PROGRAM_VER_NUM 40301003
-#define PROGRAM_BUILD   "841"
+#define PROGRAM_VERSION "4.3.05.007"
+#define PROGRAM_INSTALL "4.3.05007"
+#define PROGRAM_VER_NUM 40305007
+#define PROGRAM_BUILD   "854"
 #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.3.01.003\r\n(Build 976) - (x64 Unicode) (MSVC)\0"
+#define PRODUCT_NAME        L"TRCheatWin - Version 4.3.05.007\r\n(Build 989) - (x64 Unicode) (MSVC)\0"
 #else
 #define ORIGINAL_FILENAME   "TRCheatWin (x64 MBCS) (MSVC)\0"
-#define PRODUCT_NAME        "TRCheatWin - Version 4.3.01.003\r\n(Build 976) - (x64 MBCS) (MSVC)\0"
+#define PRODUCT_NAME        "TRCheatWin - Version 4.3.05.007\r\n(Build 989) - (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.3.01.003\r\n(Build 976) - (x86 Unicode) (MSVC)\0"
+#define PRODUCT_NAME        L"TRCheatWin - Version 4.3.05.007\r\n(Build 989) - (x86 Unicode) (MSVC)\0"
 #else
 #define ORIGINAL_FILENAME   "TRCheatWin (x86 MBCS) (MSVC)\0"
-#define PRODUCT_NAME        "TRCheatWin - Version 4.3.01.003\r\n(Build 976) - (x86 MBCS) (MSVC)\0"
+#define PRODUCT_NAME        "TRCheatWin - Version 4.3.05.007\r\n(Build 989) - (x86 MBCS) (MSVC)\0"
 #endif
 #else
 #define ORIGINAL_FILENAME   "TRCheatWin (MSVC)\0"
-#define PRODUCT_NAME        "TRCheatWin - Version 4.3.01.003\r\n(Build 976) - (MSVC)\0"
+#define PRODUCT_NAME        "TRCheatWin - Version 4.3.05.007\r\n(Build 989) - (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 : 02/08/2024 15:43:01
+//	Generated : 08/08/2024 09:11:38
 //
 //===========================================================================================
 //
@@ -57,33 +57,33 @@
 #endif
 
 #ifdef UNICODE
-#define PROGRAM_DATE    L"Fri Aug 02 15:43"
-#define PROGRAM_DATE_F  L"Fri Aug 02 15:43 2024"
+#define PROGRAM_DATE    L"Thu Aug 08 09:11"
+#define PROGRAM_DATE_F  L"Thu Aug 08 09:11 2024"
 #define PROGRAM_YEAR    L"2024"
-#define PROGRAM_TIME    L"2024/08/02 15:43:01"
+#define PROGRAM_TIME    L"2024/08/08 09:11:38"
 #else
-#define PROGRAM_DATE    "Fri Aug 02 15:43"
-#define PROGRAM_DATE_F  "Fri Aug 02 15:43 2024"
+#define PROGRAM_DATE    "Thu Aug 08 09:11"
+#define PROGRAM_DATE_F  "Thu Aug 08 09:11 2024"
 #define PROGRAM_YEAR    "2024"
-#define PROGRAM_TIME    "2024/08/02 15:43:01"
+#define PROGRAM_TIME    "2024/08/08 09:11:38"
 #endif
 
 #ifdef UNICODE
-#define PROGRAM_VERSION L"4.3.01.003"
-#define PROGRAM_INSTALL L"4.3.01003"
-#define PROGRAM_VER_NUM 40301003
-#define PROGRAM_BUILD   L"976"
+#define PROGRAM_VERSION L"4.3.05.007"
+#define PROGRAM_INSTALL L"4.3.05007"
+#define PROGRAM_VER_NUM 40305007
+#define PROGRAM_BUILD   L"989"
 #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.3.01.003"
-#define PROGRAM_INSTALL "4.3.01003"
-#define PROGRAM_VER_NUM 40301003
-#define PROGRAM_BUILD   "976"
+#define PROGRAM_VERSION "4.3.05.007"
+#define PROGRAM_INSTALL "4.3.05007"
+#define PROGRAM_VER_NUM 40305007
+#define PROGRAM_BUILD   "989"
 #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.3.1.3
+set PRODUCT_VERSION_VERS=4.3.5.7
 
 @exit /b
diff --git a/ProductVersionInfo.txt b/ProductVersionInfo.txt
@@ -1,4 +1,4 @@
-4.3.1.3
+4.3.5.7
 TRCheatWin
-TRCheatWin (x86) : Fri Aug 02 15:43 4.3.1.3
-TRCheatWin (x64) : Fri Aug 02 15:43 4.3.1.3
+TRCheatWin (x86) : Thu Aug 08 09:11 4.3.5.7
+TRCheatWin (x64) : Thu Aug 08 09:11 4.3.5.7
diff --git a/ProductVersionSize.txt b/ProductVersionSize.txt
@@ -1 +1 @@
-4.3.01.003
+4.3.05.007
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.3.01.003\r\n(Build 565) - (x64 Unicode) (MSVC)\0"
+#define PRODUCT_NAME        L"ReadTR2 - Version 4.3.05.007\r\n(Build 578) - (x64 Unicode) (MSVC)\0"
 #else
 #define ORIGINAL_FILENAME   "ReadTR2 (x64 MBCS) (MSVC)\0"
-#define PRODUCT_NAME        "ReadTR2 - Version 4.3.01.003\r\n(Build 565) - (x64 MBCS) (MSVC)\0"
+#define PRODUCT_NAME        "ReadTR2 - Version 4.3.05.007\r\n(Build 578) - (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.3.01.003\r\n(Build 565) - (x86 Unicode) (MSVC)\0"
+#define PRODUCT_NAME        L"ReadTR2 - Version 4.3.05.007\r\n(Build 578) - (x86 Unicode) (MSVC)\0"
 #else
 #define ORIGINAL_FILENAME   "ReadTR2 (x86 MBCS) (MSVC)\0"
-#define PRODUCT_NAME        "ReadTR2 - Version 4.3.01.003\r\n(Build 565) - (x86 MBCS) (MSVC)\0"
+#define PRODUCT_NAME        "ReadTR2 - Version 4.3.05.007\r\n(Build 578) - (x86 MBCS) (MSVC)\0"
 #endif
 #else
 #define ORIGINAL_FILENAME   "ReadTR2 (MSVC)\0"
-#define PRODUCT_NAME        "ReadTR2 - Version 4.3.01.003\r\n(Build 565) - (MSVC)\0"
+#define PRODUCT_NAME        "ReadTR2 - Version 4.3.05.007\r\n(Build 578) - (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 : 02/08/2024 15:43:01
+//	Generated : 08/08/2024 09:11:38
 //
 //===========================================================================================
 //
@@ -57,33 +57,33 @@
 #endif
 
 #ifdef UNICODE
-#define PROGRAM_DATE    L"Fri Aug 02 15:43"
-#define PROGRAM_DATE_F  L"Fri Aug 02 15:43 2024"
+#define PROGRAM_DATE    L"Thu Aug 08 09:11"
+#define PROGRAM_DATE_F  L"Thu Aug 08 09:11 2024"
 #define PROGRAM_YEAR    L"2024"
-#define PROGRAM_TIME    L"2024/08/02 15:43:01"
+#define PROGRAM_TIME    L"2024/08/08 09:11:38"
 #else
-#define PROGRAM_DATE    "Fri Aug 02 15:43"
-#define PROGRAM_DATE_F  "Fri Aug 02 15:43 2024"
+#define PROGRAM_DATE    "Thu Aug 08 09:11"
+#define PROGRAM_DATE_F  "Thu Aug 08 09:11 2024"
 #define PROGRAM_YEAR    "2024"
-#define PROGRAM_TIME    "2024/08/02 15:43:01"
+#define PROGRAM_TIME    "2024/08/08 09:11:38"
 #endif
 
 #ifdef UNICODE
-#define PROGRAM_VERSION L"4.3.01.003"
-#define PROGRAM_INSTALL L"4.3.01003"
-#define PROGRAM_VER_NUM 40301003
-#define PROGRAM_BUILD   L"565"
+#define PROGRAM_VERSION L"4.3.05.007"
+#define PROGRAM_INSTALL L"4.3.05007"
+#define PROGRAM_VER_NUM 40305007
+#define PROGRAM_BUILD   L"578"
 #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.3.01.003"
-#define PROGRAM_INSTALL "4.3.01003"
-#define PROGRAM_VER_NUM 40301003
-#define PROGRAM_BUILD   "565"
+#define PROGRAM_VERSION "4.3.05.007"
+#define PROGRAM_INSTALL "4.3.05007"
+#define PROGRAM_VER_NUM 40305007
+#define PROGRAM_BUILD   "578"
 #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,3,01,003
- PRODUCTVERSION 4,3,01,003
+ FILEVERSION 4,3,05,007
+ PRODUCTVERSION 4,3,05,007
  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.3.01.003\0"
+            VALUE "FileVersion", "4.3.05.007\0"
             VALUE "InternalName", "https://www.macallan.org/\0"
-            VALUE "LegalCopyright", "Copyright (C) Fri Aug 02 15:43, 2024\0"
+            VALUE "LegalCopyright", "Copyright (C) Thu Aug 08 09:11, 2024\0"
             VALUE "LegalTrademarks", "Author: Ian Macallan\0"
             VALUE "OriginalFilename", ORIGINAL_FILENAME
-            VALUE "PrivateBuild", "565\0"
+            VALUE "PrivateBuild", "578\0"
             VALUE "ProductName", PRODUCT_NAME
-            VALUE "ProductVersion", "4.3.01.003\0"
-            VALUE "SpecialBuild", "565\0"
+            VALUE "ProductVersion", "4.3.05.007\0"
+            VALUE "SpecialBuild", "578\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/TR45SaveGame.h b/TR45SaveGame.h
@@ -5,6 +5,8 @@
 #define TR4_MIN_HEALTH      0
 #define TR4_MAX_HEALTH      1000
 #define TR4_ALT_HEALTH      0x7fff
+//  If bit 9 is Set in Health this means invisible
+#define TR4_INVISIBLE       0x100
 
 #define TR5_MIN_HEALTH      0
 #define TR5_MAX_HEALTH      1000
@@ -20,14 +22,15 @@ typedef struct indicatorTR45Struct
     BYTE    b3;
     BYTE    b4;
     BOOL    useB3;
+    //  0 for reliable
+    //  1-8 for usable
+    //  9 for unusable
     int     step;
     char    szLabel [ INDICATOR_LABEL_SIZE ];
 } TR45_INDICATORS;
 #pragma pack(pop, pack1)
 
 //
-static const int MaxReliableIndicator   = 2;
-
 //
 static const int MinTR4PositionOffset   = 0x280;
 static const int MaxTR4PositionOffset   = 0x3000;