flixel 5.7.0 fix + update workflows haxe version

MaybeMaru · Apr 16, 2024 · 382e76e · 382e76e
1 parent ff7f0dd
commit 382e76e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Install & Setup Haxe
         uses: krdlab/setup-haxe@master
         with:
-          haxe-version: 4.3.3
+          haxe-version: 4.3.4
 
       - name: Install Libraries
         run: |
@@ -33,7 +33,7 @@ jobs:
           haxelib set hxcpp git
 
       - name: Build
-        run: haxelib run lime build windows -D analyzer-optimize
+        run: haxelib run lime build windows -D analyzer-optimize no-deprecation-warnings
 
       - name: Upload Artifact
         uses: actions/upload-artifact@main
@@ -54,7 +54,7 @@ jobs:
       - name: Install & Setup Haxe
         uses: krdlab/setup-haxe@master
         with:
-          haxe-version: 4.3.3
+          haxe-version: 4.3.4
 
       - name: Install Libraries
         run: |
@@ -64,7 +64,7 @@ jobs:
           haxelib set hxcpp git
 
       - name: Build
-        run: haxelib run lime build linux -D analyzer-optimize
+        run: haxelib run lime build linux -D analyzer-optimize no-deprecation-warnings
 
       - name: Upload Artifact
         uses: actions/upload-artifact@main
@@ -85,7 +85,7 @@ jobs:
       - name: Install & Setup Haxe
         uses: krdlab/setup-haxe@master
         with:
-          haxe-version: 4.3.3
+          haxe-version: 4.3.4
 
       - name: Setup Android NDK
         id: setup-ndk
@@ -117,7 +117,7 @@ jobs:
           ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
 
       - name: Build
-        run: haxelib run lime build android -D analyzer-optimize
+        run: haxelib run lime build android -D analyzer-optimize no-deprecation-warnings
 
       - name: Upload Artifact
         uses: actions/upload-artifact@main

diff --git a/source/funkin/graphics/TypedGroup.hx b/source/funkin/graphics/TypedGroup.hx
@@ -109,7 +109,9 @@ class TypedSpriteGroup<T:FlxSprite> extends FlxTypedSpriteGroup<T>
 		group.destroy();
 
 		group = new TypedGroup<T>(maxSize);
+		#if (flixel < "5.7.0")
 		_sprites = cast group.members;
+		#end
 	}
 }
 

diff --git a/source/funkin/objects/alphabet/Alphabet.hx b/source/funkin/objects/alphabet/Alphabet.hx
@@ -6,6 +6,7 @@ enum abstract AlphabetAlign(String) {
     var RIGHT = 'right';
 }
 
+// TODO: rewrite Alphabet to extend FlxBitmapText
 class Alphabet extends TypedSpriteGroup<AlphabetCharacter> {
     public static var spaceWidth:Float = 50;
     public static var spaceHeight:Float = 70;
@@ -133,10 +134,10 @@ class Alphabet extends TypedSpriteGroup<AlphabetCharacter> {
         return text.split("");
     }
 
-        override function findMaxXHelper()
+    override function findMaxXHelper()
 	{
 		var value = Math.NEGATIVE_INFINITY;
-		for (member in _sprites)
+		for (member in group.members)
 		{
 			if (member == null || !member.alive)
 				continue;
@@ -156,7 +157,7 @@ class Alphabet extends TypedSpriteGroup<AlphabetCharacter> {
     override function findMinXHelper()
 	{
 		var value = Math.POSITIVE_INFINITY;
-		for (member in _sprites)
+		for (member in group.members)
 		{
 			if (member == null || !member.alive)
 				continue;