From 73321eceb96f263f10857667d7b3726a5098e770 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 17 Mar 2021 20:36:31 -0400
Subject: split compile flag into separate Windows + XNA flags (#767)

---
 src/SMAPI.Mods.ErrorHandler/Patches/SpriteBatchValidationPatches.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/SMAPI.Mods.ErrorHandler/Patches')

diff --git a/src/SMAPI.Mods.ErrorHandler/Patches/SpriteBatchValidationPatches.cs b/src/SMAPI.Mods.ErrorHandler/Patches/SpriteBatchValidationPatches.cs
index 95e4f5ef..f605b2ce 100644
--- a/src/SMAPI.Mods.ErrorHandler/Patches/SpriteBatchValidationPatches.cs
+++ b/src/SMAPI.Mods.ErrorHandler/Patches/SpriteBatchValidationPatches.cs
@@ -27,7 +27,7 @@ namespace StardewModdingAPI.Mods.ErrorHandler.Patches
 #endif
         {
             harmony.Patch(
-#if SMAPI_FOR_WINDOWS
+#if SMAPI_FOR_XNA
                 original: AccessTools.Method(typeof(SpriteBatch), "InternalDraw"),
 #else
                 original: AccessTools.Method(typeof(SpriteBatch), "CheckValid", new[] { typeof(Texture2D) }),
@@ -40,7 +40,7 @@ namespace StardewModdingAPI.Mods.ErrorHandler.Patches
         /*********
         ** Private methods
         *********/
-#if SMAPI_FOR_WINDOWS
+#if SMAPI_FOR_XNA
         /// <summary>The method to call instead of <see cref="SpriteBatch.InternalDraw"/>.</summary>
         /// <param name="texture">The texture to validate.</param>
 #else
-- 
cgit 


From ca67dcc920560f3fd19a4531c40fdb03d19e96c5 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 17 Mar 2021 20:36:32 -0400
Subject: add Constants.GameFramework field (#767)

---
 .../Patches/SpriteBatchValidationPatches.cs                       | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/SMAPI.Mods.ErrorHandler/Patches')

diff --git a/src/SMAPI.Mods.ErrorHandler/Patches/SpriteBatchValidationPatches.cs b/src/SMAPI.Mods.ErrorHandler/Patches/SpriteBatchValidationPatches.cs
index f605b2ce..8056fd71 100644
--- a/src/SMAPI.Mods.ErrorHandler/Patches/SpriteBatchValidationPatches.cs
+++ b/src/SMAPI.Mods.ErrorHandler/Patches/SpriteBatchValidationPatches.cs
@@ -27,11 +27,9 @@ namespace StardewModdingAPI.Mods.ErrorHandler.Patches
 #endif
         {
             harmony.Patch(
-#if SMAPI_FOR_XNA
-                original: AccessTools.Method(typeof(SpriteBatch), "InternalDraw"),
-#else
-                original: AccessTools.Method(typeof(SpriteBatch), "CheckValid", new[] { typeof(Texture2D) }),
-#endif
+                original: Constants.GameFramework == GameFramework.Xna
+                    ? AccessTools.Method(typeof(SpriteBatch), "InternalDraw")
+                    : AccessTools.Method(typeof(SpriteBatch), "CheckValid", new[] { typeof(Texture2D) }),
                 postfix: new HarmonyMethod(this.GetType(), nameof(SpriteBatchValidationPatches.After_SpriteBatch_CheckValid))
             );
         }
-- 
cgit