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

null check if difficulties dont exist

Browse source
This commit is contained in:
Cameron Taylor 2022-01-25 21:14:31 -05:00
parent 21726ee56a
commit a0271a3e92
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/SongLoad.hx
View file

@ -145,12 +145,13 @@ class SongLoad
*/ */
public static function castArrayToNoteData(noteStuff:Array<SwagSection>) public static function castArrayToNoteData(noteStuff:Array<SwagSection>)
{ {
if (noteStuff == null)
return;
for (sectionIndex => section in noteStuff) for (sectionIndex => section in noteStuff)
{ {
for (noteIndex => noteDataArray in section.sectionNotes) for (noteIndex => noteDataArray in section.sectionNotes)
{ {
trace(noteDataArray);
var arrayDipshit:Array<Dynamic> = cast noteDataArray; // crackhead var arrayDipshit:Array<Dynamic> = cast noteDataArray; // crackhead
// at this point noteStuff[sectionIndex].sectionNotes[noteIndex] is an array because of the cast from the first line in this function // at this point noteStuff[sectionIndex].sectionNotes[noteIndex] is an array because of the cast from the first line in this function
@ -170,6 +171,9 @@ class SongLoad
*/ */
public static function castNoteDataToArray(noteStuff:Array<SwagSection>) public static function castNoteDataToArray(noteStuff:Array<SwagSection>)
{ {
if (noteStuff == null)
return;
for (sectionIndex => section in noteStuff) for (sectionIndex => section in noteStuff)
{ {
for (noteIndex => noteTypeDefShit in section.sectionNotes) for (noteIndex => noteTypeDefShit in section.sectionNotes)

3
source/charting/ChartingState.hx
View file

@ -6,6 +6,7 @@ import Section.SwagSection;
import SongLoad.SwagSong; import SongLoad.SwagSong;
import flixel.FlxSprite; import flixel.FlxSprite;
import flixel.addons.display.FlxGridOverlay; import flixel.addons.display.FlxGridOverlay;
import flixel.addons.transition.FlxTransitionableState;
import flixel.addons.ui.FlxInputText; import flixel.addons.ui.FlxInputText;
import flixel.addons.ui.FlxUI; import flixel.addons.ui.FlxUI;
import flixel.addons.ui.FlxUICheckBox; import flixel.addons.ui.FlxUICheckBox;
@ -216,6 +217,8 @@ class ChartingState extends MusicBeatState
var reloadSongJson:FlxButton = new FlxButton(reloadSong.x, saveButton.y + 30, "Reload JSON", function() var reloadSongJson:FlxButton = new FlxButton(reloadSong.x, saveButton.y + 30, "Reload JSON", function()
{ {
FlxTransitionableState.skipNextTransIn = true;
FlxTransitionableState.skipNextTransOut = true;
loadJson(_song.song.toLowerCase()); loadJson(_song.song.toLowerCase());
}); });