Add stuck sprite fix and logging

- See 07th-mod/higurashi-rei#4 - See #45
07th-mod · Aug 20, 2022 · 0de0e97 · 0de0e97
1 parent 6b488ed
commit 0de0e97
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/Assets.Scripts.Core.Scene/LayerPool.cs b/Assets.Scripts.Core.Scene/LayerPool.cs
@@ -30,6 +30,13 @@ public void ReturnLayer(Layer layer)
 		{
 			layer.LayerID = null;
 			GameObject gameObject = layer.gameObject;
+
+			if (IsInPool(gameObject))
+			{
+				MOD.Scripts.Core.MODLogger.Log("WARNING: Ignoring layer returned twice", true);
+				return;
+			}
+
 			gameObject.transform.parent = base.transform;
 			gameObject.layer = LayerMask.NameToLayer("NotRendered");
 			gameObject.SetActive(value: false);

diff --git a/Assets.Scripts.Core.Scene/SceneController.cs b/Assets.Scripts.Core.Scene/SceneController.cs
@@ -314,6 +314,10 @@ public void FadeSprite(int layer, float wait, bool isblocking)
 			{
 				ifInUse.FadeOutLayer(wait, isblocking);
 			}
+			else
+			{
+				MOD.Scripts.Core.MODLogger.Log($"WARNING: FadeSprite Failed as layer not in use", true);
+			}
 		}
 
 		public void DrawSprite(int layer, string texture, string mask, int x, int y, int z, int originx, int originy, int angle, int style, float alpha, int priority, float wait, bool isblocking)