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

Merge pull request #685 from FunkinCrew/70ltan/char-path-fix

Browse source 
[PUBLIC PR] Fix an issue with character paths
This commit is contained in:
Cameron Taylor 2024-08-20 14:21:58 -04:00 committed by GitHub
commit af8c52a489
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/funkin/play/character/AnimateAtlasCharacter.hx
View file

@ -129,7 +129,7 @@ class AnimateAtlasCharacter extends BaseCharacter
{ {
trace('[ATLASCHAR] Loading sprite atlas for ${characterId}.'); trace('[ATLASCHAR] Loading sprite atlas for ${characterId}.');
var sprite:FlxAtlasSprite = new FlxAtlasSprite(0, 0, Paths.animateAtlas(_data.assetPath, 'shared')); var sprite:FlxAtlasSprite = new FlxAtlasSprite(0, 0, Paths.animateAtlas(_data.assetPath));
// sprite.onAnimationComplete.removeAll(); // sprite.onAnimationComplete.removeAll();
sprite.onAnimationComplete.add(this.onAnimationFinished); sprite.onAnimationComplete.add(this.onAnimationFinished);

4
source/funkin/play/character/MultiSparrowCharacter.hx
View file

@ -62,7 +62,7 @@ class MultiSparrowCharacter extends BaseCharacter
} }
} }
var texture:FlxAtlasFrames = Paths.getSparrowAtlas(_data.assetPath, 'shared'); var texture:FlxAtlasFrames = Paths.getSparrowAtlas(_data.assetPath);
if (texture == null) if (texture == null)
{ {
@ -76,7 +76,7 @@ class MultiSparrowCharacter extends BaseCharacter
for (asset in assetList) for (asset in assetList)
{ {
var subTexture:FlxAtlasFrames = Paths.getSparrowAtlas(asset, 'shared'); var subTexture:FlxAtlasFrames = Paths.getSparrowAtlas(asset);
// If we don't do this, the unused textures will be removed as soon as they're loaded. // If we don't do this, the unused textures will be removed as soon as they're loaded.
if (subTexture == null) if (subTexture == null)

2
source/funkin/play/character/PackerCharacter.hx
View file

@ -30,7 +30,7 @@ class PackerCharacter extends BaseCharacter
{ {
trace('[PACKERCHAR] Loading spritesheet ${_data.assetPath} for ${characterId}'); trace('[PACKERCHAR] Loading spritesheet ${_data.assetPath} for ${characterId}');
var tex:FlxFramesCollection = Paths.getPackerAtlas(_data.assetPath, 'shared'); var tex:FlxFramesCollection = Paths.getPackerAtlas(_data.assetPath);
if (tex == null) if (tex == null)
{ {
trace('Could not load Packer sprite: ${_data.assetPath}'); trace('Could not load Packer sprite: ${_data.assetPath}');

2
source/funkin/play/character/SparrowCharacter.hx
View file

@ -33,7 +33,7 @@ class SparrowCharacter extends BaseCharacter
{ {
trace('[SPARROWCHAR] Loading spritesheet ${_data.assetPath} for ${characterId}'); trace('[SPARROWCHAR] Loading spritesheet ${_data.assetPath} for ${characterId}');
var tex:FlxFramesCollection = Paths.getSparrowAtlas(_data.assetPath, 'shared'); var tex:FlxFramesCollection = Paths.getSparrowAtlas(_data.assetPath);
if (tex == null) if (tex == null)
{ {
trace('Could not load Sparrow sprite: ${_data.assetPath}'); trace('Could not load Sparrow sprite: ${_data.assetPath}');