Skip to content

Commit c284d50

Browse files
committed
game over fix
1 parent 33d0205 commit c284d50

File tree

2 files changed

+21
-42
lines changed

2 files changed

+21
-42
lines changed

setup/windows.bat

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -45,28 +45,3 @@ haxelib git tentools https://github.com/TentaRJ/tentools.git
4545
haxelib git systools https://github.com/haya3218/systools
4646
haxelib run lime rebuild systools windows
4747
echo Finished!
48-
pause
49-
50-
REM Ask user if they want to ensure the exact required versions
51-
set /p ensure_versions="Do you want to ensure the exact required library versions? (y/n): "
52-
if /i "%ensure_versions%"=="y" (
53-
haxelib set lime 8.2.2
54-
haxelib set openfl 9.4.1
55-
haxelib set flixel 5.6.2
56-
haxelib set flixel-addons 3.3.2
57-
haxelib set flixel-tools 1.5.1
58-
haxelib set hscript-iris 1.1.3
59-
haxelib set tjson 1.4.0
60-
haxelib set hxdiscord_rpc 1.3.0
61-
haxelib set hxvlc 2.0.1
62-
haxelib set helder.set 0.3.1
63-
haxelib set yaml 2.0.1
64-
haxelib set hxWebSockets git
65-
haxelib set haxe-concurrent 5.1.3
66-
haxelib set actuate 1.9.0
67-
haxelib set flixel-ui 2.6.1
68-
haxelib set hscript 2.5.0
69-
haxelib set noisehx 0.0.1
70-
REM Add more haxelib set commands here if you add more versioned libraries above
71-
echo All required library versions have been set.
72-
)

source/substates/GameOverSubstate.hx

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -246,23 +246,27 @@ class GameOverSubstate extends MusicBeatSubstate
246246
}
247247
else if (justPlayedLoop)
248248
{
249-
switch(PlayState.SONG.stage)
250-
{
251-
case 'tank':
252-
coolStartDeath(0.2);
253-
254-
var exclude:Array<Int> = [];
255-
//if(!ClientPrefs.cursing) exclude = [1, 3, 8, 13, 17, 21];
256-
257-
FlxG.sound.play(Paths.sound('jeffGameover/jeffGameover-' + FlxG.random.int(1, 25, exclude)), 1, false, null, true, function() {
258-
if(!isEnding)
259-
{
260-
FlxG.sound.music.fadeIn(0.2, 1, 4);
261-
}
262-
});
263-
264-
default:
265-
coolStartDeath();
249+
if (PlayState.SONG != null) {
250+
switch(PlayState.SONG.stage)
251+
{
252+
case 'tank':
253+
coolStartDeath(0.2);
254+
255+
var exclude:Array<Int> = [];
256+
//if(!ClientPrefs.cursing) exclude = [1, 3, 8, 13, 17, 21];
257+
258+
FlxG.sound.play(Paths.sound('jeffGameover/jeffGameover-' + FlxG.random.int(1, 25, exclude)), 1, false, null, true, function() {
259+
if(!isEnding)
260+
{
261+
FlxG.sound.music.fadeIn(0.2, 1, 4);
262+
}
263+
});
264+
265+
default:
266+
coolStartDeath();
267+
}
268+
} else {
269+
coolStartDeath();
266270
}
267271
}
268272

0 commit comments

Comments
 (0)