Skip to content

Commit 5578e9a

Browse files
committed
swap legacy and v-slice icons & pause fix
#stinky
1 parent dde08ac commit 5578e9a

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

art/SwitchIco.png

-323 KB
Loading

source/PauseSubState.hx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ class PauseSubState extends MusicBeatSubstate
3030
var curSelected:Int = 0;
3131

3232
var pauseMusic:FlxSound;
33+
var cantUnpause:Float = 0.1;
3334

3435
var practiceText:FlxText;
3536

@@ -121,14 +122,16 @@ class PauseSubState extends MusicBeatSubstate
121122

122123
override function update(elapsed:Float)
123124
{
125+
cantUnpause -= elapsed;
126+
124127
if (pauseMusic.volume < 0.5)
125128
pauseMusic.volume += 0.01 * elapsed;
126129

127130
super.update(elapsed);
128131

129132
var upP = controls.UI_UP_P;
130133
var downP = controls.UI_DOWN_P;
131-
var accepted = controls.ACCEPT;
134+
var accepted = controls.ACCEPT && cantUnpause <= 0;
132135

133136
if (upP)
134137
{

source/PlayState.hx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1804,6 +1804,7 @@ class PlayState extends MusicBeatState
18041804
if (!startTimer.finished)
18051805
startTimer.active = true;
18061806
paused = false;
1807+
skipNoteInput = 0.15;
18071808

18081809
#if discord_rpc
18091810
if (startTimer.finished)
@@ -1856,6 +1857,7 @@ class PlayState extends MusicBeatState
18561857
}
18571858

18581859
private var paused:Bool = false;
1860+
private var skipNoteInput:Float = 0;
18591861
var startedCountdown:Bool = false;
18601862
var canPause:Bool = true;
18611863

@@ -2623,6 +2625,12 @@ class PlayState extends MusicBeatState
26232625

26242626
private function keyShit():Void
26252627
{
2628+
if (skipNoteInput > 0)
2629+
{
2630+
skipNoteInput -= FlxG.elapsed;
2631+
return;
2632+
}
2633+
26262634
// control arrays, order L D R U
26272635
var holdArray:Array<Bool> = [controls.NOTE_LEFT, controls.NOTE_DOWN, controls.NOTE_UP, controls.NOTE_RIGHT];
26282636
var pressArray:Array<Bool> = [

0 commit comments

Comments
 (0)