Skip to content

Commit d773c7b

Browse files
Merge branch 'CodenameCrew:main' into main
2 parents 5400489 + ca60663 commit d773c7b

File tree

7 files changed

+6
-6
lines changed

7 files changed

+6
-6
lines changed

assets/images/game/score/num1.png

-439 Bytes
Loading
-16 Bytes
Loading

assets/paths.json

Whitespace-only changes.

assets/songs/winter horrorland/charts/easy.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

assets/songs/winter horrorland/charts/hard.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

assets/songs/winter horrorland/charts/normal.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

source/funkin/game/PlayState.hx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,9 +1256,6 @@ class PlayState extends MusicBeatState
12561256

12571257
updateRatingStuff();
12581258

1259-
if (controls.PAUSE && startedCountdown && canPause)
1260-
pauseGame();
1261-
12621259
if (canAccessDebugMenus) {
12631260
if (chartingMode && FlxG.keys.justPressed.SEVEN) {
12641261
FlxG.switchState(new funkin.editors.charter.Charter(SONG.meta.name, difficulty, false));
@@ -1300,6 +1297,9 @@ class PlayState extends MusicBeatState
13001297
while(events.length > 0 && events.last().time <= Conductor.songPosition)
13011298
executeEvent(events.pop());
13021299

1300+
if (controls.PAUSE && startedCountdown && canPause)
1301+
pauseGame();
1302+
13031303
if (generatedMusic && strumLines.members[curCameraTarget] != null)
13041304
{
13051305
var pos = FlxPoint.get();

0 commit comments

Comments
 (0)