From f39da383a17b368e92fd243cf155b27ba42671f3 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 13 Apr 2022 20:24:14 -0400
Subject: enable nullable annotations in SMAPI where no logic changes are
 needed (#837)

---
 src/SMAPI/Framework/Rendering/SDisplayDevice.cs    | 8 +++-----
 src/SMAPI/Framework/Rendering/SXnaDisplayDevice.cs | 4 +---
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/SMAPI/Framework/Rendering')

diff --git a/src/SMAPI/Framework/Rendering/SDisplayDevice.cs b/src/SMAPI/Framework/Rendering/SDisplayDevice.cs
index 8718bcb1..37996b0f 100644
--- a/src/SMAPI/Framework/Rendering/SDisplayDevice.cs
+++ b/src/SMAPI/Framework/Rendering/SDisplayDevice.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Content;
@@ -27,7 +25,7 @@ namespace StardewModdingAPI.Framework.Rendering
         /// <param name="tile">The tile to draw.</param>
         /// <param name="location">The tile position to draw.</param>
         /// <param name="layerDepth">The layer depth at which to draw.</param>
-        public override void DrawTile(Tile tile, Location location, float layerDepth)
+        public override void DrawTile(Tile? tile, Location location, float layerDepth)
         {
             // identical to XnaDisplayDevice
             if (tile == null)
@@ -58,7 +56,7 @@ namespace StardewModdingAPI.Framework.Rendering
         /// <param name="tile">The tile being drawn.</param>
         private SpriteEffects GetSpriteEffects(Tile tile)
         {
-            return tile.Properties.TryGetValue("@Flip", out PropertyValue propertyValue) && int.TryParse(propertyValue, out int value)
+            return tile.Properties.TryGetValue("@Flip", out PropertyValue? propertyValue) && int.TryParse(propertyValue, out int value)
                 ? (SpriteEffects)value
                 : SpriteEffects.None;
         }
@@ -67,7 +65,7 @@ namespace StardewModdingAPI.Framework.Rendering
         /// <param name="tile">The tile being drawn.</param>
         private float GetRotation(Tile tile)
         {
-            if (!tile.Properties.TryGetValue("@Rotation", out PropertyValue propertyValue) || !int.TryParse(propertyValue, out int value))
+            if (!tile.Properties.TryGetValue("@Rotation", out PropertyValue? propertyValue) || !int.TryParse(propertyValue, out int value))
                 return 0;
 
             value %= 360;
diff --git a/src/SMAPI/Framework/Rendering/SXnaDisplayDevice.cs b/src/SMAPI/Framework/Rendering/SXnaDisplayDevice.cs
index 21edaedd..94b13378 100644
--- a/src/SMAPI/Framework/Rendering/SXnaDisplayDevice.cs
+++ b/src/SMAPI/Framework/Rendering/SXnaDisplayDevice.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
@@ -91,7 +89,7 @@ namespace StardewModdingAPI.Framework.Rendering
         /// <param name="tile">The tile to draw.</param>
         /// <param name="location">The tile position to draw.</param>
         /// <param name="layerDepth">The layer depth at which to draw.</param>
-        public virtual void DrawTile(Tile tile, Location location, float layerDepth)
+        public virtual void DrawTile(Tile? tile, Location location, float layerDepth)
         {
             if (tile == null)
                 return;
-- 
cgit