cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-15 11:22:55 +00:00
Code Issues Releases Wiki Activity

Merge pull request #768 from FunkinCrew/kadedev/addcharacter-type

Browse source 
[PUBLIC PR] Move characterType assignment to Stage.addCharacter
This commit is contained in:
Cameron Taylor 2024-09-20 00:23:53 -04:00 committed by GitHub
parent 4af4c2defc b5ed7f40d4
commit 426bff3bf5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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
//

3
source/funkin/play/stage/Stage.hx
View file

@ -464,6 +464,9 @@ class Stage extends FlxSpriteGroup implements IPlayStateScriptedClass implements
#end
}
// Set the characters type
character.characterType = charType;
// Add the character to the scene.
this.add(character);