fix Nape tilemap for 5.9.0+ (#437)

* fix Nape tilemap for 5.9.0+ * update ci
HaxeFlixel · Jun 15, 2024 · cdeb0de · cdeb0de
1 parent f76d8b2
commit cdeb0de
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,7 +10,7 @@ jobs:
   build:
     strategy:
       matrix:
-        haxe-version: ["4.2.5", "4.3.3"]
+        haxe-version: ["4.2.5", "4.3.4"]
         target: [html5, hl, neko, flash, cpp]
       fail-fast: false
     runs-on: ubuntu-latest
@@ -29,9 +29,8 @@ jobs:
         haxelib install haxelib 4.0.3
         haxelib dev flixel-addons .
     
-    - uses: HaxeFlixel/setup-flixel@v1
+    - uses: HaxeFlixel/setup-flixel@master
       with:
-        haxe-version: current
         flixel-versions: dev
         target: ${{matrix.target}}
         run-tests: true
diff --git a/flixel/addons/nape/FlxNapeTilemap.hx b/flixel/addons/nape/FlxNapeTilemap.hx
@@ -1,13 +1,13 @@
 package flixel.addons.nape;
 
-import flixel.addons.nape.FlxNapeSpace;
 import flixel.FlxG;
+import flixel.addons.nape.FlxNapeSpace;
 import flixel.math.FlxPoint;
 import flixel.math.FlxRect;
+import flixel.system.FlxAssets;
+import flixel.tile.FlxBaseTilemap;
 import flixel.tile.FlxTilemap;
 import flixel.util.FlxArrayUtil;
-import flixel.tile.FlxBaseTilemap;
-import flixel.system.FlxAssets;
 import nape.geom.Vec2;
 import nape.phys.Body;
 import nape.phys.BodyType;
@@ -100,11 +100,12 @@ class FlxNapeTilemap extends FlxTilemap
 		var polygon:Polygon;
 		for (index in tileIndices)
 		{
-			var coords:Array<FlxPoint> = getTileCoords(index, false);
-			if (coords == null)
-				continue;
-
-			for (point in coords)
+			#if (flixel >= "5.9.0")
+			final points = getAllTilePos(index);
+			#else
+			final points = getTileCoords(index, false);
+			#end
+			for (point in points)
 			{
 				polygon = new Polygon(vertices, mat);
 				polygon.translate(Vec2.get(point.x, point.y));