fix crash in getWorldPos (#3231)

HaxeFlixel · Aug 13, 2024 · a52272d · a52272d
1 parent a6478fd
commit a52272d
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 1 deletion.
diff --git a/flixel/input/FlxPointer.hx b/flixel/input/FlxPointer.hx
@@ -74,7 +74,7 @@ class FlxPointer
 		if (camera == null)
 			camera = FlxG.camera;
 
-		getViewPosition(camera, result);
+		result = getViewPosition(camera, result);
 		result.addPoint(camera.scroll);
 		return result;
 	}

diff --git a/tests/unit/src/flixel/input/FlxPointerTest.hx b/tests/unit/src/flixel/input/FlxPointerTest.hx
@@ -69,4 +69,48 @@ class FlxPointerTest
 		Assert.areEqual(150, pointer.x);
 		Assert.areEqual(124, pointer.y);
 	}
+
+	@Test
+	function testNullResult()
+	{
+		try
+		{
+			final result = pointer.getPosition();
+			Assert.areEqual(0, result.x);
+		}
+		catch(e)
+		{
+			Assert.fail('Exception thrown from "getPosition", message: "${e.message}"');
+		}
+
+		try
+		{
+			final result = pointer.getWorldPosition();
+			Assert.areEqual(0, result.x);
+		}
+		catch(e)
+		{
+			Assert.fail('Exception thrown from "getWorldPosition", message: "${e.message}"');
+		}
+
+		try
+		{
+			final result = pointer.getViewPosition();
+			Assert.areEqual(0, result.x);
+		}
+		catch(e)
+		{
+			Assert.fail('Exception thrown from "getViewPosition", message: "${e.message}"');
+		}
+
+		try
+		{
+			final result = pointer.getGamePosition();
+			Assert.areEqual(0, result.x);
+		}
+		catch(e)
+		{
+			Assert.fail('Exception thrown from "getGamePosition", message: "${e.message}"');
+		}
+	}
 }