gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fixed options not saving

Browse Source
This commit is contained in:
Yoshman29
2022-10-18 22:12:56 +02:00
parent 72e7c98b0c
commit 616212e986
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildnumber.txt
+1 -1
View File
@@ -1 +1 @@
527 533
source/funkin/game/Note.hx
+2
View File
@@ -51,6 +51,8 @@ class Note extends FlxSprite
prevNote = this; prevNote = this;
this.prevNote = prevNote; this.prevNote = prevNote;
this.mustPress = mustPress;
this.noteTypeID = noteType;
isSustainNote = sustainNote; isSustainNote = sustainNote;
x += 50; x += 50;
source/funkin/game/PlayState.hx
+4 -4
View File
@@ -277,7 +277,7 @@ class PlayState extends MusicBeatState
iconP1 = new HealthIcon(boyfriend.getIcon(), true); iconP1 = new HealthIcon(boyfriend.getIcon(), true);
iconP2 = new HealthIcon(boyfriend.getIcon(), true); iconP2 = new HealthIcon(dad.getIcon(), false);
for(icon in [iconP1, iconP2]) { for(icon in [iconP1, iconP2]) {
icon.y = healthBar.y - (icon.height / 2); icon.y = healthBar.y - (icon.height / 2);
add(icon); add(icon);
@@ -443,7 +443,7 @@ class PlayState extends MusicBeatState
var daStrumTime:Float = songNotes[0]; var daStrumTime:Float = songNotes[0];
var daNoteData:Int = Std.int(songNotes[1] % 8); var daNoteData:Int = Std.int(songNotes[1] % 8);
var daNoteType:Int = Std.int(songNotes[1] / 8); var daNoteType:Int = Std.int(songNotes[1] / 8);
var gottaHitNote:Bool = songNotes[1] >= 4 ? !section.mustHitSection : section.mustHitSection; var gottaHitNote:Bool = daNoteData >= 4 ? !section.mustHitSection : section.mustHitSection;
if (songNotes.length > 2) { if (songNotes.length > 2) {
if (songNotes[3] is Int) if (songNotes[3] is Int)
@@ -458,7 +458,7 @@ class PlayState extends MusicBeatState
else else
swagNote = null; swagNote = null;
swagNote = new Note(daStrumTime, daNoteData, daNoteType, gottaHitNote, swagNote); swagNote = new Note(daStrumTime, daNoteData % 4, daNoteType, gottaHitNote, swagNote);
swagNote.sustainLength = songNotes[2]; swagNote.sustainLength = songNotes[2];
swagNote.scrollFactor.set(0, 0); swagNote.scrollFactor.set(0, 0);
notes.add(swagNote); notes.add(swagNote);
@@ -470,7 +470,7 @@ class PlayState extends MusicBeatState
// create sustains // create sustains
for (susNote in 0...Math.floor(susLength)) for (susNote in 0...Math.floor(susLength))
{ {
swagNote = new Note(daStrumTime + (Conductor.stepCrochet * susNote), daNoteData, daNoteType, gottaHitNote, swagNote, true); swagNote = new Note(daStrumTime + (Conductor.stepCrochet * susNote), daNoteData % 4, daNoteType, gottaHitNote, swagNote, true);
swagNote.scrollFactor.set(); swagNote.scrollFactor.set();
notes.add(swagNote); notes.add(swagNote);
} }
source/funkin/options/Options.hx
+2 -1
View File
@@ -152,6 +152,7 @@ class Options
if (!__eventAdded) { if (!__eventAdded) {
Lib.application.onExit.add(function(i:Int) { Lib.application.onExit.add(function(i:Int) {
trace("saving settings...");
save(); save();
}); });
__eventAdded = true; __eventAdded = true;
@@ -159,7 +160,7 @@ class Options
} }
public static function save() { public static function save() {
for(field in Reflect.fields(Options)) { for(field in Type.getClassFields(Options)) {
var obj = Reflect.field(Options, field); var obj = Reflect.field(Options, field);
if (Reflect.isFunction(obj) || obj is FlxSave) continue; if (Reflect.isFunction(obj) || obj is FlxSave) continue;
Reflect.setField(__save.data, field, obj); Reflect.setField(__save.data, field, obj);