Additional GOG log message

6666c · Jun 13, 2019 · ad12f0e · ad12f0e
1 parent b72013e
commit ad12f0e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/installer2/Installer.java b/installer2/Installer.java
@@ -8,6 +8,7 @@ public class Installer
 {
     private static final String TERRARIA_VERSION = "v1.3.5.3";
     private static final int TERRARIA_SIZE = 10786816; // Windows only: We only want to make a backup of the official release
+    private static final int TERRARIA_SIZE_GOG = 10786816; // Could potentially differ in a later release. Coincidence?
 
     public static void tryInstall(String[] files, String[] filesToDelete, File directory, boolean WindowsInstall)
     {
@@ -38,7 +39,7 @@ private static void install(String[] files, String[] filesToDelete, File directo
         {
             File terrariaBackup = new File(directory, "Terraria_" + TERRARIA_VERSION + ".exe");
             File terrariaUnknown = new File(directory, "Terraria_Unknown.exe");
-            if (!terrariaBackup.exists() && terraria.length() == TERRARIA_SIZE)
+            if (!terrariaBackup.exists() && (terraria.length() == TERRARIA_SIZE || terraria.length() == TERRARIA_SIZE_GOG))
             {
                 copy(terraria, terrariaBackup);
             }

diff --git a/patches/tModLoader/Terraria.ModLoader.Engine/GoGVerifier.cs b/patches/tModLoader/Terraria.ModLoader.Engine/GoGVerifier.cs
@@ -29,8 +29,10 @@ private static bool GoGCheck() {
 			}
 
 			var vanillaPath = Path.GetFileName(Assembly.GetExecutingAssembly().Location) != "Terraria.exe" ? "Terraria.exe" : "Terraria_v1.3.5.3.exe";
-			if (!File.Exists(vanillaPath))
+			if (!File.Exists(vanillaPath)) {
+				Logging.tML.Info("Vanilla Terraria.exe not found.");
 				return false;
+			}
 
 			if (!HashMatchesFile(GoGHash, vanillaPath))
 				return false;