Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-14 19:25:16 -05:00
Code Issues Projects Releases Packages Wiki Activity

Remove redundant character type assignment

Browse source
This commit is contained in:
EliteMasterEric 2024-09-18 05:24:57 -04:00
parent de07497ae3
commit b5ed7f40d4
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/funkin/play/PlayState.hx
View file

@ -1612,7 +1612,7 @@ class PlayState extends MusicBeatSubState
if (girlfriend != null) if (girlfriend != null)
{ {
girlfriend.characterType = CharacterType.GF; // Don't need to do anything.
} }
else if (currentCharacterData.girlfriend != '') else if (currentCharacterData.girlfriend != '')
{ {
@ -1630,8 +1630,6 @@ class PlayState extends MusicBeatSubState
if (dad != null) if (dad != null)
{ {
dad.characterType = CharacterType.DAD;
// //
// OPPONENT HEALTH ICON // OPPONENT HEALTH ICON
// //
@ -1650,8 +1648,6 @@ class PlayState extends MusicBeatSubState
if (boyfriend != null) if (boyfriend != null)
{ {
boyfriend.characterType = CharacterType.BF;
// //
// PLAYER HEALTH ICON // 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.) // Skip this if the music is paused (GameOver, Pause menu, start-of-song offset, etc.)
if (!(FlxG.sound.music?.playing ?? false)) return; if (!(FlxG.sound.music?.playing ?? false)) return;
var timeToPlayAt:Float = Conductor.instance.songPosition - Conductor.instance.instrumentalOffset; var timeToPlayAt:Float = Conductor.instance.songPosition - Conductor.instance.instrumentalOffset;
FlxG.sound.music.pause(); FlxG.sound.music.pause();
vocals.pause(); vocals.pause();