cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-03-21 09:29:41 +00:00
Code Issues Releases Wiki Activity

import fix + weird git merge thing lol (doesnt build)

Browse source
This commit is contained in:
Cameron Taylor 2022-04-28 23:46:37 -04:00
parent 43dbce2be1
commit e24de498a1
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,12 +2,13 @@ package funkin.play.stage;
import flixel.FlxSprite;
import flixel.group.FlxSpriteGroup;
import flixel.math.FlxPoint;
import flixel.util.FlxSort;
import funkin.modding.IHook;
import funkin.modding.IScriptedClass;
import funkin.modding.events.ScriptEvent;
import funkin.modding.events.ScriptEventDispatcher;
import funkin.play.character.Character.CharacterType;
import funkin.play.character.BaseCharacter;
import funkin.play.stage.StageData.StageDataParser;
import funkin.util.SortUtil;
import funkin.util.assets.FlxAnimationUtil;
@ -145,8 +146,6 @@ class Stage extends FlxSpriteGroup implements IHook implements IPlayStateScripte
if (Std.isOfType(propSprite, Bopper))
{
cast(propSprite, Bopper).setAnimationOffsets(propAnim.name, propAnim.offsets[0], propAnim.offsets[1]);
<<<<<<< HEAD
=======
}
}
default: // "sparrow"
@ -156,11 +155,8 @@ class Stage extends FlxSpriteGroup implements IHook implements IPlayStateScripte
for (propAnim in dataProp.animations)
{
cast(propSprite, Bopper).setAnimationOffsets(propAnim.name, propAnim.offsets[0], propAnim.offsets[1]);
>>>>>>> origin/feature/scripted-modules
}
}
default: // "sparrow"
FlxAnimationUtil.addAtlasAnimations(propSprite, dataProp.animations);
}
if (Std.isOfType(propSprite, Bopper))