Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix camera tween #24

Merged
merged 8 commits into from
Sep 24, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use isGamePaused
  • Loading branch information
lemz1 committed Sep 22, 2024
commit 74cc3517024238fb9e329edc2c81822e957219fc
7 changes: 2 additions & 5 deletions source/funkin/play/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ class PlayState extends MusicBeatSubState
{
// Note: If there is a substate which requires the game to act unpaused,
// this should be changed to include something like `&& Std.isOfType()`
return this.subState != null;
return this.subState != null || this._requestedSubState != null;
}

var isExitingViaPauseMenu(get, never):Bool;
Expand Down Expand Up @@ -932,7 +932,6 @@ class PlayState extends MusicBeatSubState
Conductor.instance.update(); // Normal conductor update.
}

var isPaused:Bool = false;
var androidPause:Bool = false;

#if android
Expand All @@ -948,8 +947,6 @@ class PlayState extends MusicBeatSubState

if (!event.eventCanceled)
{
isPaused = true;

// Pause updates while the substate is open, preventing the game state from advancing.
persistentUpdate = false;
// Enable drawing while the substate is open, allowing the game state to be shown behind the pause menu.
Expand Down Expand Up @@ -1086,7 +1083,7 @@ class PlayState extends MusicBeatSubState
}
}

if (!isPaused)
if (!isGamePaused)
{
processSongEvents();

Expand Down