Fixed preferences not saving #50

Author: HielkeMaps

datafiles_yy/Data/settings.file

@@ -31,14 +31,11 @@ clickinarea = 0
 dontplace = 0
 vers = version
 soundsystem = 0
-soundsystemuser = 0
 menu_shown = ""
 songfolder = songs_directory
 icons_init()
-modspeed = 0
-modspeeduser = 0
+refreshrate = 0 //0 = 30fps, 1 = 60fps
 fade = 0
-fadeuser = 0
 
 // File
 filename = ""
@@ -145,7 +142,6 @@ dragincyu = 0
 // Layers
 realvolume = 1
 realstereo = 0
-realstereouser = 0
 layername[0] = ""
 layerlock[0] = 0
 layervol[0] = 100
@@ -304,7 +300,7 @@ if (check_update)
     update_http = http_get("https://api.github.com/repos/HielkeMinecraft/OpenNoteBlockStudio/releases/latest")
 else
     update_http = -1
-if (file_exists_lib(data_directory + "settings.file") && vers != version) {
+if (file_exists_lib(data_directory + "settings.onbs") && vers != version) {
     window = w_update
     update = 3
 }

datafiles_yy/Data/settings.file.yy

@@ -11,7 +11,7 @@ draw_set_alpha(1)
 draw_theme_color()
 draw_set_font(fnt_main)
 editline += 1
-if modspeed = 1 game_set_speed(60,gamespeed_fps)
+if refreshrate = 1 game_set_speed(60,gamespeed_fps)
 if (editline > 60) editline = 0
 if (delay > 0) delay -= 1 / (room_speed / 20)
 if (delay < 0) delay = 0
@@ -191,14 +191,14 @@ for (a = 0; a < totalcols; a += 1) {
                     if (startb + b >= colfirst[starta + a] && startb + b <= collast[starta + a]) {
                         if (song_exists[starta + a, startb + b]) {
                             s = 0 // Selected
-                            if (fadeuser=0) c = 0.5
+                            if (fade=0) c = 0.5
 							else c = 1
                             if (lockedlayer[startb + b] = 0) c += 0.5 * (1 - (min(1000, current_time - song_played[starta + a, startb + b]) / 1000))
                             if (playing = 0) {
                                 if (select = 1 && lockedlayer[startb + b] = 0) {
                                     s = (starta + a >= min(select_pressa, selbx) && starta + a <= max(select_pressa, selbx) && startb + b >= min(select_pressb, selby) && startb + b <= max(select_pressb, selby))
                                 }
-                                if (fadeuser=0) c += ((selbx = starta + a && selby = startb + b && select = 0 && window = 0  && cursmarker = 0) || s) * 0.5
+                                if (fade=0) c += ((selbx = starta + a && selby = startb + b && select = 0 && window = 0  && cursmarker = 0) || s) * 0.5
                             }
                             draw_block(x1 + 2 + 32 * a, y1 + 34 + 32 * b, song_ins[starta + a, startb + b], song_key[starta + a, startb + b], c, s * 0.8)
                         }

scripts/control_create/control_create.gml

@@ -68,13 +68,13 @@ if (selected_tab = 0) {
 	if (draw_radiobox(x1 + 40, y1 + 164 + 16 + 20, theme == 2, "Dark", "Use the dark theme.")) {theme = 2 change_theme()}
     if (draw_radiobox(x1 + 40, y1 + 164 + 16 + 20 + 20, theme == 1, "90s", "Use the 90s theme.")) {theme = 1 change_theme()}
     draw_areaheader(x1+258,y1+164,220,60,"Room Speed (Experimental)")
-    if (draw_radiobox(x1+274,y1+164+16,!modspeeduser,"30FPS","Run the program at 30FPS.")) {
+    if (draw_radiobox(x1+274,y1+164+16,!refreshrate,"30FPS","Run the program at 30FPS.")) {
         game_set_speed(30,gamespeed_fps)
-		modspeeduser=0
+		refreshrate=0
     }
-    if (draw_radiobox(x1+274,y1+164+16+20,modspeeduser,"60FPS","Run the program at 60FPS.")) {
+    if (draw_radiobox(x1+274,y1+164+16+20,refreshrate,"60FPS","Run the program at 60FPS.")) {
         game_set_speed(60,gamespeed_fps)
-		modspeeduser=1
+		refreshrate=1
     }
 
 	draw_text(x1 + 22, y1 + 260, "Song folder: " + string_maxwidth(songfolder, 360) + condstr(string_width(songfolder) > 360, "..."))
@@ -100,12 +100,7 @@ if (selected_tab = 0) {
 
     if (draw_checkbox(x1 + 40, y1 + 160, show_numbers, "Show key numbers", "Whether to show the amount of right - clicks required\nfor each note block.")) show_numbers=!show_numbers
     if (draw_checkbox(x1 + 40, y1 + 180, show_octaves, "Show octave numbers", "Whether the number of the octave the note block\nis in should be shown.")) show_octaves=!show_octaves
-	if (draw_checkbox(x1 + 40, y1 + 200, fade, "No Fading", "Disables transparency animations on note block sprites"))	{
-		fade = !fade
-		if fade = !fade
-		fade = 1
-		fadeuser = 1
-	}
+	if (draw_checkbox(x1 + 40, y1 + 200, fade, "No Fading", "Disables transparency animations on note block sprites")) fade = !fade
 
 
     draw_areaheader(x1 + 22, y1 + 240, 456, 110, "Piano")
@@ -136,12 +131,7 @@ if (selected_tab = 0) {
     if (draw_checkbox(x1 + 40, y1 + 170, marker_end, "Stop playing after section", "Whether to stop playing when the\nmarker passes the active section.")) marker_end=!marker_end
     draw_areaheader(x1 + 22, y1 + 224, 456, 65, "Playing")
     if (draw_checkbox(x1 + 32, y1 + 224 + 16, realvolume, "Show layer volumes", "Whether to show the volume of layers.")) realvolume=!realvolume
-if (draw_checkbox(x1 + 32, y1 + 244 + 16, realstereo, "Disable Stereo", "Disables stereo playback.")) {
-		realstereo = !realstereo
-		if realstereo = !realstereo
-		realstereo = 1
-		realstereouser = 1
-	}
+if (draw_checkbox(x1 + 32, y1 + 244 + 16, realstereo, "Disable Stereo", "Disables stereo playback.")) realstereo = !realstereo
 }
 if (draw_button2(x1 + 420, y1 + 368, 72, "OK")) window = 0
 window_set_cursor(curs)

scripts/control_draw/control_draw.gml

@@ -96,13 +96,9 @@ warning_schematic = buffer_read_byte()
 vers = buffer_read_string_int()
 sch_exp_minecraft_old = buffer_read_byte()
 soundsystem = max(0, buffer_read_byte())
-soundsystemuser = soundsystem
-modspeed = buffer_read_byte()
-modspeeduser = modspeed
+refreshrate = buffer_read_byte()
 fade = buffer_read_byte()
-fadeuser = fade
 realstereo = buffer_read_byte()
-realstereouser = realstereo
 
 buffer_delete(buffer)
 return 1

scripts/draw_window_preferences/draw_window_preferences.gml

@@ -15,8 +15,7 @@ if (!ins.loaded)
 emitter=audio_emitter_create()
 audio_emitter_pitch(emitter, 0.495 * power(1.06, (key + ins.key - 78)))
 audio_emitter_gain(emitter, vol)
-if realstereouser = 0 {
-	audio_emitter_position(emitter,pan,0,0)
-} else
-audio_emitter_position(emitter,100,0,0)
+if (realstereo = 0) audio_emitter_position(emitter,pan,0,0)
+else audio_emitter_position(emitter,100,0,0)
+
 audio_play_sound_on(emitter,ins.sound, 0, 0)

scripts/load_settings/load_settings.gml

@@ -65,7 +65,6 @@ editline = 0
 solostr = ""
 dragvolb = 0
 realstereo = 0
-realstereouser = 0
 
 // Piano
 selected_key = 39

scripts/play_sound/play_sound.gml

@@ -88,11 +88,11 @@ buffer_write_byte(warning_schematic)
 // 3.1.1+
 buffer_write_string_int(version)
 buffer_write_byte(sch_exp_minecraft_old)
-buffer_write_byte(soundsystemuser)
+buffer_write_byte(soundsystem)
 // OpenNBS Features
-buffer_write_byte(modspeeduser)
-buffer_write_byte(fadeuser)
-buffer_write_byte(realstereouser)
+buffer_write_byte(refreshrate)
+buffer_write_byte(fade)
+buffer_write_byte(realstereo)
 
 buffer_export(buffer, data_directory + "settings.onbs")
 buffer_delete(buffer)