Skip to content

Commit 762ab00

Browse files
committed
Merge branch 'Archipelago' of https://github.com/Z11Coding/Mixtape-Engine-Rework into Archipelago
2 parents a204b07 + 488d6ec commit 762ab00

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

setup/windows.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ haxelib git grig.audio https://gitlab.com/haxe-grig/grig.audio.git cbf91e2180fd2
2727
haxelib git haxeui-core https://github.com/haxeui/haxeui-core 51c23588614397089a5ce182cddea729f0be6fa0
2828
haxelib git haxeui-flixel https://github.com/haxeui/haxeui-flixel da27e833947f32ef007ed11f523aa5524f5a5d54
2929
haxelib git flixel-text-input https://github.com/FunkinCrew/flixel-text-input 951a0103a17bfa55eed86703ce50b4fb0d7590bc
30+
haxelib git FlxPartialSound https://github.com/FunkinCrew/FlxPartialSound.git f986332ba5ab02abd386ce662578baf04904604a
3031
haxelib git tentools https://github.com/TentaRJ/tentools.git
3132
haxelib git systools https://github.com/haya3218/systools
3233
haxelib run lime rebuild systools windows

source/archipelago/APPlayState.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1928,7 +1928,7 @@ class APPlayState extends PlayState {
19281928
}
19291929
else if (spellPrompts[i].ttl <= 0)
19301930
{
1931-
COD.setCOD("Apparently, " + apGame.info().slot + " bad at spelling.");
1931+
COD.setCOD('Apparently, ${apGame.info().slot} is bad at spelling.');
19321932
die();
19331933
FlxG.sound.play(Paths.sound('streamervschat/spellfail'));
19341934
camOther.flash(FlxColor.RED, 1, null, true);

source/backend/TransitionState.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class TransitionState {
5555
trace("Switch complete.");
5656
isTransitioning = false;
5757
if (targetState == null) {
58-
trace("Target state is null. 49celling switch.");
58+
trace("Target state is null. Cancelling switch.");
5959
targetState = Type.getClass(FlxG.state);
6060
}
6161
FlxG.switchState(Type.createInstance(targetState, stateArgs != null ? stateArgs : []));

0 commit comments

Comments
 (0)