FlxG.cameras: fix reset() not removing all cameras (#2016)

Regression from edf93b5.
HaxeFlixel · Dec 26, 2016 · 1c714ba · 1c714ba
1 parent 000bac9
commit 1c714ba
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/flixel/system/frontEnds/CameraFrontEnd.hx b/flixel/system/frontEnds/CameraFrontEnd.hx
@@ -97,11 +97,9 @@ class CameraFrontEnd
 	 */
 	public function reset(?NewCamera:FlxCamera):Void
 	{
-		for (camera in list)
-			remove(camera);
-
-		list.splice(0, list.length);
-
+		while (list.length > 0)
+			remove(list[0]);
+
 		if (NewCamera == null)
 			NewCamera = new FlxCamera(0, 0, FlxG.width, FlxG.height);
 
@@ -295,4 +293,4 @@ class CameraFrontEnd
 
 		return Color;
 	}
-}
+}
diff --git a/tests/unit/src/FlxTest.hx b/tests/unit/src/FlxTest.hx
@@ -17,9 +17,9 @@ class FlxTest
 
 	public function new() {}
 
+	@After
 	@:access(flixel)
-	@AfterClass
-	function afterClass()
+	function after()
 	{
 		FlxG.game.getTimer = function()
 		{

diff --git a/tests/unit/src/flixel/system/frontEnds/CameraFrontEndTest.hx b/tests/unit/src/flixel/system/frontEnds/CameraFrontEndTest.hx
@@ -3,7 +3,7 @@ package flixel.system.frontEnds;
 import flixel.FlxCamera;
 import massive.munit.Assert;
 
-class CameraFrontEndTest
+class CameraFrontEndTest extends FlxTest
 {
 	@Test
 	public function testCameraAdded()
@@ -50,4 +50,16 @@ class CameraFrontEndTest
 
 		FlxG.cameras.cameraResized.removeAll();
 	}
+
+	@Test
+	function testResetCameras()
+	{
+		Assert.areEqual(1, FlxG.cameras.list.length);
+
+		FlxG.cameras.add(new FlxCamera());
+		Assert.areEqual(2, FlxG.cameras.list.length);
+
+		FlxG.cameras.reset();
+		Assert.areEqual(1, FlxG.cameras.list.length);
+	}
 }