mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2025-01-26 06:37:23 +00:00
Remove redundant character type assignment
This commit is contained in:
parent
de07497ae3
commit
b5ed7f40d4
|
@ -1612,7 +1612,7 @@ class PlayState extends MusicBeatSubState
|
|||
|
||||
if (girlfriend != null)
|
||||
{
|
||||
girlfriend.characterType = CharacterType.GF;
|
||||
// Don't need to do anything.
|
||||
}
|
||||
else if (currentCharacterData.girlfriend != '')
|
||||
{
|
||||
|
@ -1630,8 +1630,6 @@ class PlayState extends MusicBeatSubState
|
|||
|
||||
if (dad != null)
|
||||
{
|
||||
dad.characterType = CharacterType.DAD;
|
||||
|
||||
//
|
||||
// OPPONENT HEALTH ICON
|
||||
//
|
||||
|
@ -1650,8 +1648,6 @@ class PlayState extends MusicBeatSubState
|
|||
|
||||
if (boyfriend != null)
|
||||
{
|
||||
boyfriend.characterType = CharacterType.BF;
|
||||
|
||||
//
|
||||
// PLAYER HEALTH ICON
|
||||
//
|
||||
|
@ -1993,6 +1989,7 @@ class PlayState extends MusicBeatSubState
|
|||
|
||||
// Skip this if the music is paused (GameOver, Pause menu, start-of-song offset, etc.)
|
||||
if (!(FlxG.sound.music?.playing ?? false)) return;
|
||||
|
||||
var timeToPlayAt:Float = Conductor.instance.songPosition - Conductor.instance.instrumentalOffset;
|
||||
FlxG.sound.music.pause();
|
||||
vocals.pause();
|
||||
|
|
Loading…
Reference in a new issue