Skip to content

Commit 894d8cb

Browse files
LasercarAbnormalPoof
authored andcommitted
Fix chart(er)
The charter is literally never ever set in the new or clone function of the songMetadata. HOW????
1 parent 3fd8050 commit 894d8cb

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

source/funkin/data/song/SongData.hx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,12 @@ class SongMetadata implements ICloneable<SongMetadata>
6868
@:jignored
6969
public var variation:String;
7070

71-
public function new(songName:String, artist:String, ?variation:String)
71+
public function new(songName:String, artist:String, ?charter:String, ?variation:String)
7272
{
7373
this.version = SongRegistry.SONG_METADATA_VERSION;
7474
this.songName = songName;
7575
this.artist = artist;
76+
this.charter = (charter == null) ? null : charter;
7677
this.timeFormat = 'ms';
7778
this.divisions = null;
7879
this.offsets = new SongOffsets();
@@ -96,7 +97,7 @@ class SongMetadata implements ICloneable<SongMetadata>
9697
*/
9798
public function clone():SongMetadata
9899
{
99-
var result:SongMetadata = new SongMetadata(this.songName, this.artist, this.variation);
100+
var result:SongMetadata = new SongMetadata(this.songName, this.artist, this.charter, this.variation);
100101
result.version = this.version;
101102
result.timeFormat = this.timeFormat;
102103
result.divisions = this.divisions;
@@ -139,7 +140,7 @@ class SongMetadata implements ICloneable<SongMetadata>
139140
*/
140141
public function toString():String
141142
{
142-
return 'SongMetadata(${this.songName} by ${this.artist}, variation ${this.variation})';
143+
return 'SongMetadata(${this.songName} by ${this.artist} and ${this.charter}, variation ${this.variation})';
143144
}
144145
}
145146

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1168,6 +1168,10 @@ class ChartEditorDialogHandler
11681168
if (dialogSongArtist == null) throw 'Could not locate dialogSongArtist TextField in Add Variation dialog';
11691169
dialogSongArtist.value = state.currentSongMetadata.artist;
11701170

1171+
var dialogSongCharter:Null<TextField> = dialog.findComponent('dialogSongCharter', TextField);
1172+
if (dialogSongCharter == null) throw 'Could not locate dialogSongCharter TextField in Add Variation dialog';
1173+
dialogSongCharter.value = state.currentSongMetadata.charter;
1174+
11711175
var dialogStage:Null<DropDown> = dialog.findComponent('dialogStage', DropDown);
11721176
if (dialogStage == null) throw 'Could not locate dialogStage DropDown in Add Variation dialog';
11731177
var startingValueStage = ChartEditorDropdowns.populateDropdownWithStages(dialogStage, state.currentSongMetadata.playData.stage);

0 commit comments

Comments
 (0)