cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-07-12 06:10:23 +00:00
Code Issues Releases Wiki Activity

Merge pull request #805 from FunkinCrew/bugfix/two-fixes

Browse source 
[PUBLIC PR] Two bug fixes
This commit is contained in:
Cameron Taylor 2024-09-30 10:33:20 -04:00 committed by GitHub
parent 66781181fa 9d3131bc8d
commit 84ff83759f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/funkin/audio/FunkinSound.hx
View file

@ -430,12 +430,13 @@ class FunkinSound extends FlxSound implements ICloneable<FunkinSound>
* @param autoDestroy Whether to destroy this sound when it finishes playing. * @param autoDestroy Whether to destroy this sound when it finishes playing.
* Leave this value set to `false` if you want to re-use this `FunkinSound` instance. * Leave this value set to `false` if you want to re-use this `FunkinSound` instance.
* @param autoPlay Whether to play the sound immediately or wait for a `play()` call. * @param autoPlay Whether to play the sound immediately or wait for a `play()` call.
* @param persist Whether to keep this `FunkinSound` between states, or destroy it.
* @param onComplete Called when the sound finished playing. * @param onComplete Called when the sound finished playing.
* @param onLoad Called when the sound finished loading. Called immediately for succesfully loaded embedded sounds. * @param onLoad Called when the sound finished loading. Called immediately for succesfully loaded embedded sounds.
* @return A `FunkinSound` object, or `null` if the sound could not be loaded. * @return A `FunkinSound` object, or `null` if the sound could not be loaded.
*/ */
public static function load(embeddedSound:FlxSoundAsset, volume:Float = 1.0, looped:Bool = false, autoDestroy:Bool = false, autoPlay:Bool = false, public static function load(embeddedSound:FlxSoundAsset, volume:Float = 1.0, looped:Bool = false, autoDestroy:Bool = false, autoPlay:Bool = false,
?onComplete:Void->Void, ?onLoad:Void->Void):Null<FunkinSound> persist:Bool = false, ?onComplete:Void->Void, ?onLoad:Void->Void):Null<FunkinSound>
{ {
@:privateAccess @:privateAccess
if (SoundMixer.__soundChannels.length >= SoundMixer.MAX_ACTIVE_CHANNELS) if (SoundMixer.__soundChannels.length >= SoundMixer.MAX_ACTIVE_CHANNELS)
@ -462,7 +463,7 @@ class FunkinSound extends FlxSound implements ICloneable<FunkinSound>
if (autoPlay) sound.play(); if (autoPlay) sound.play();
sound.volume = volume; sound.volume = volume;
sound.group = FlxG.sound.defaultSoundGroup; sound.group = FlxG.sound.defaultSoundGroup;
sound.persist = true; sound.persist = persist;
// Make sure to add the sound to the list. // Make sure to add the sound to the list.
// If it's already in, it won't get re-added. // If it's already in, it won't get re-added.

8
source/funkin/play/character/BaseCharacter.hx
View file

@ -233,15 +233,9 @@ class BaseCharacter extends Bopper
*/ */
public function resetCharacter(resetCamera:Bool = true):Void public function resetCharacter(resetCamera:Bool = true):Void
{ {
// Reset the animation offsets. This will modify x and y to be the absolute position of the character. // Set the x and y to be their original values.
// this.animOffsets = [0, 0];
// Now we can set the x and y to be their original values without having to account for animOffsets.
this.resetPosition(); this.resetPosition();
// Then reapply animOffsets...
// applyAnimationOffsets(getCurrentAnimation());
this.dance(true); // Force to avoid the old animation playing with the wrong offset at the start of the song. this.dance(true); // Force to avoid the old animation playing with the wrong offset at the start of the song.
// Make sure we are playing the idle animation // Make sure we are playing the idle animation
// ...then update the hitbox so that this.width and this.height are correct. // ...then update the hitbox so that this.width and this.height are correct.

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

@ -150,11 +150,8 @@ class Bopper extends StageProp implements IPlayStateScriptedClass
*/ */
public function resetPosition() public function resetPosition()
{ {
var oldAnimOffsets = [animOffsets[0], animOffsets[1]];
animOffsets = [0, 0];
this.x = originalPosition.x; this.x = originalPosition.x;
this.y = originalPosition.y; this.y = originalPosition.y;
animOffsets = oldAnimOffsets;
} }
function update_shouldAlternate():Void function update_shouldAlternate():Void

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

@ -443,12 +443,7 @@ class Stage extends FlxSpriteGroup implements IPlayStateScriptedClass implements
character.x = stageCharData.position[0] - character.characterOrigin.x; character.x = stageCharData.position[0] - character.characterOrigin.x;
character.y = stageCharData.position[1] - character.characterOrigin.y; character.y = stageCharData.position[1] - character.characterOrigin.y;
@:privateAccess(funkin.play.stage.Bopper) character.originalPosition.set(character.x, character.y);
{
// Undo animOffsets before saving original position.
character.originalPosition.x = character.x + character.animOffsets[0];
character.originalPosition.y = character.y + character.animOffsets[1];
}
var finalScale = character.getBaseScale() * stageCharData.scale; var finalScale = character.getBaseScale() * stageCharData.scale;
character.setScale(finalScale); // Don't use scale.set for characters! character.setScale(finalScale); // Don't use scale.set for characters!