Skip to content

Commit 65ccad9

Browse files
committed
lasercar.................................................................................................................................................................................................
1 parent 203e8eb commit 65ccad9

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

source/funkin/data/song/importer/FNFLegacyImporter.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class FNFLegacyImporter
3737
{
3838
trace('Migrating song metadata from FNF Legacy.');
3939

40-
var songMetadata:SongMetadata = new SongMetadata('Import', Constants.DEFAULT_ARTIST, 'default');
40+
var songMetadata:SongMetadata = new SongMetadata('Import', Constants.DEFAULT_ARTIST, Constants.DEFAULT_CHARTER, Constants.DEFAULT_VARIATION);
4141

4242
// Set generatedBy string for debugging.
4343
songMetadata.generatedBy = 'Chart Editor Import (FNF Legacy)';

source/funkin/data/song/migrator/SongDataMigrator.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class SongDataMigrator
2424

2525
public static function migrate_SongMetadata_v2_1_0(input:SongData_v2_1_0.SongMetadata_v2_1_0):SongMetadata
2626
{
27-
var result:SongMetadata = new SongMetadata(input.songName, input.artist, input.variation);
27+
var result:SongMetadata = new SongMetadata(input.songName, input.artist, Constants.DEFAULT_CHARTER, input.variation);
2828
result.version = SongRegistry.SONG_METADATA_VERSION;
2929
result.timeFormat = input.timeFormat;
3030
result.divisions = input.divisions;
@@ -66,7 +66,7 @@ class SongDataMigrator
6666

6767
public static function migrate_SongMetadata_v2_0_0(input:SongData_v2_0_0.SongMetadata_v2_0_0):SongMetadata
6868
{
69-
var result:SongMetadata = new SongMetadata(input.songName, input.artist, input.variation);
69+
var result:SongMetadata = new SongMetadata(input.songName, input.artist, Constants.DEFAULT_CHARTER, input.variation);
7070
result.version = SongRegistry.SONG_METADATA_VERSION;
7171
result.timeFormat = input.timeFormat;
7272
result.divisions = input.divisions;

source/funkin/ui/debug/charting/ChartEditorState.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1306,7 +1306,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
13061306
var result:Null<SongMetadata> = songMetadata.get(selectedVariation);
13071307
if (result == null)
13081308
{
1309-
result = new SongMetadata('Default Song Name', Constants.DEFAULT_ARTIST, selectedVariation);
1309+
result = new SongMetadata('Default Song Name', Constants.DEFAULT_ARTIST, Constants.DEFAULT_CHARTER, selectedVariation);
13101310
songMetadata.set(selectedVariation, result);
13111311
}
13121312
return result;

source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ class ChartEditorDialogHandler
580580
dialog.hideDialog(DialogButton.CANCEL);
581581
}
582582

583-
var newSongMetadata:SongMetadata = new SongMetadata('', '', Constants.DEFAULT_VARIATION);
583+
var newSongMetadata:SongMetadata = new SongMetadata('', '', '', Constants.DEFAULT_VARIATION);
584584

585585
newSongMetadata.variation = targetVariation;
586586
newSongMetadata.playData.difficulties = (erect) ? ['erect', 'nightmare'] : ['easy', 'normal', 'hard'];
@@ -1219,7 +1219,8 @@ class ChartEditorDialogHandler
12191219
var dialogVariationName:Null<TextField> = dialog.findComponent('dialogVariationName', TextField);
12201220
if (dialogVariationName == null) throw 'Could not locate dialogVariationName TextField in Add Variation dialog';
12211221

1222-
var pendingVariation:SongMetadata = new SongMetadata(dialogSongName.text, dialogSongArtist.text, dialogVariationName.text.toLowerCase());
1222+
var pendingVariation:SongMetadata = new SongMetadata(dialogSongName.text, dialogSongArtist.text, dialogSongCharter.text,
1223+
dialogVariationName.text.toLowerCase());
12231224

12241225
pendingVariation.playData.stage = dialogStage.value.id;
12251226
pendingVariation.playData.noteStyle = dialogNoteStyle.value.id;

0 commit comments

Comments
 (0)