Skip to content

Commit f9aaa5d

Browse files
committed
Merge branch 'alpha' into enhancement/animation-priority
2 parents b2ad97f + 1a6521b commit f9aaa5d

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

.github/workflows/main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup Haxe
1717
uses: krdlab/setup-haxe@master
1818
with:
19-
haxe-version: latest
19+
haxe-version: 4.3.7
2020

2121
- name: Retrieve Haxelib Cache
2222
id: windows-haxelib-cache
@@ -52,7 +52,7 @@ jobs:
5252
- name: Setup Haxe
5353
uses: krdlab/setup-haxe@master
5454
with:
55-
haxe-version: latest
55+
haxe-version: 4.3.7
5656

5757
- name: Retrieve Haxelib Cache
5858
id: macos-haxelib-cache
@@ -88,7 +88,7 @@ jobs:
8888
- name: Setup Haxe
8989
uses: krdlab/setup-haxe@master
9090
with:
91-
haxe-version: latest
91+
haxe-version: 4.3.7
9292

9393
- name: Retrieve Haxelib Cache
9494
id: linux-haxelib-cache
@@ -125,7 +125,7 @@ jobs:
125125
- name: Setup Haxe
126126
uses: krdlab/setup-haxe@master
127127
with:
128-
haxe-version: latest
128+
haxe-version: 4.3.7
129129

130130
- name: Setup Android NDK
131131
uses: nttld/setup-ndk@v1
@@ -181,7 +181,7 @@ jobs:
181181
- name: Setup Haxe
182182
uses: krdlab/setup-haxe@master
183183
with:
184-
haxe-version: latest
184+
haxe-version: 4.3.7
185185

186186
- name: Retrieve Haxelib Cache
187187
id: ios-haxelib-cache

src/funkin/objects/FunkinSprite.hx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package funkin.objects;
22

3+
import flixel.FlxCamera;
34
import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup;
5+
import flixel.math.FlxPoint;
46
import flixel.util.FlxSignal.FlxTypedSignal;
57
import flxanimate.FlxAnimate;
68
import funkin.structures.ObjectStructure;
@@ -157,10 +159,10 @@ class FunkinSprite extends FlxSprite
157159
atlas.colorTransform = colorTransform;
158160
}
159161

160-
// crusher, dont you FUCKING dare import these.
161-
override public function getScreenPosition(?result:flixel.math.FlxPoint, ?camera:flixel.FlxCamera):flixel.math.FlxPoint
162+
// crusher, do you FUCKING dare import these.
163+
override public function getScreenPosition(?result:FlxPoint, ?camera:FlxCamera):FlxPoint
162164
{
163-
var point:flixel.math.FlxPoint = super.getScreenPosition(result, camera);
165+
var point:FlxPoint = super.getScreenPosition(result, camera);
164166

165167
if (spritesAreAngy)
166168
point.add(FlxG.random.float(-2, 2), FlxG.random.float(-2, 2));

0 commit comments

Comments
 (0)