Store new preferences in settings file

Store 'Show layer boxes' and 'Save options' in the file
Moved some variable definitions to before the settings are loaded
Some small formatting fixes

Author: Bentroen

scripts/control_create/control_create.gml

@@ -324,20 +324,6 @@ dat_visualizer = 0
 //MP3
 mp3_includelocked = 0
 
-// Settings
-load_settings()
-change_theme()
-if (show_welcome) window = w_greeting
-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.onbs") && vers != version) {
-    window = w_update
-    update = 3
-}
-log("Startup OK")
-
 // Macros
 stereo_reverse = 0
 tremolotype = 0
@@ -355,6 +341,20 @@ setpan = 0
 // Saving
 save_version = nbs_version
 
+// Settings
+load_settings()
+change_theme()
+if (show_welcome) window = w_greeting
+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.onbs") && vers != version) {
+    window = w_update
+    update = 3
+}
+log("Startup OK")
+
 // Open song
 if (parameter_count() > 0) {
 	filename = parameter_string(1)

scripts/load_settings/load_settings.gml

@@ -17,10 +17,11 @@ theme =              ini_read_real(  "preferences", "theme",              theme)
 refreshrate =        ini_read_real(  "preferences", "refresh_rate",       refreshrate)
 songfolder =         ini_read_string("preferences", "song_folder",        songfolder)
 patternfolder =      ini_read_string("preferences", "pattern_folder",     patternfolder)
+draw_type =          ini_read_real(  "preferences", "draw_type",          draw_type)
 show_numbers =       ini_read_real(  "preferences", "show_numbers",       show_numbers)
 show_octaves =       ini_read_real(  "preferences", "show_octaves",       show_octaves)
 fade =               ini_read_real(  "preferences", "use_fading",         fade)
-draw_type =          ini_read_real(  "preferences", "draw_type",          draw_type)
+show_layers =        ini_read_real(  "preferences", "show_layers",        show_layers)
 show_piano =         ini_read_real(  "preferences", "show_piano",         show_piano)
 keysmax =            ini_read_real(  "preferences", "keys_to_show",       keysmax)
 show_keynames =      ini_read_real(  "preferences", "show_keynames",      show_keynames)
@@ -36,6 +37,7 @@ marker_end =         ini_read_real(  "preferences", "marker_end",         marker
 realvolume =         ini_read_real(  "preferences", "show_layer_volumes", realvolume)
 realstereo =         ini_read_real(  "preferences", "use_stereo",         realstereo)
 looptobarend =       ini_read_real(  "preferences", "loop_to_bar_end",    looptobarend)
+save_version =       ini_read_real(  "preferences", "save_version",       save_version)
 
 // Midi import settings
 w_midi_remember =     ini_read_real(  "midi_import", "remember",        w_midi_remember)

scripts/load_song/load_song.gml

@@ -17,28 +17,28 @@ if (file_ext = ".schematic") {
     open_schematic(fn)
     return 1
 }
-if (file_ext != ".nbs") {message("Error: This file cannot be opened in this program.", "Error") return 0}
+if (file_ext != ".nbs") { message("Error: This file cannot be opened in this program.", "Error") return 0 }
 if (file_ext = ".nbs") {
     buffer = buffer_import(fn)
 
 	byte1 = buffer_read_byte()
 	byte2 = buffer_read_byte()
 
-	if(byte1 = 0 && byte2 = 0){
+	if (byte1 = 0 && byte2 = 0) {
 		song_nbs_version = buffer_read_byte()
 		if song_nbs_version < nbs_version message("Warning: You are opening an older NBS file. Saving this file will make it incompatible with older Note Block Studio versions.","Warning")
 		if song_nbs_version > nbs_version {
-			message("Warning: You are opening an NBS file created in a later version of Note Block Studio.\nPlease save the song as a V4 file or lower via the Save Options menu.","Error")
+			message("Warning: You are opening an NBS file created in a later version of Note Block Studio.\nPlease save the song as a version " + string(nbs_version) + " file or lower via the Save Options menu.","Error")
 			return -1
 		}
 		song_first_custom_index = buffer_read_byte()
 		custom_index_diff = first_custom_index - song_first_custom_index
 
-		//From nbt version 3, we save the song length again
-		if(song_nbs_version >= 3){
+		//From nbs version 3, we save the song length again
+		if(song_nbs_version >= 3) {
 			buffer_read_short()
 		}
-	}else{
+	} else {
 		message("Warning: You are opening an older NBS file. Saving this file will make it incompatible with older Note Block Studio versions.","Warning")
 		song_nbs_version = 0
 		custom_index_diff = 0
@@ -84,14 +84,14 @@ if (file_ext = ".nbs") {
     if (filename_ext(a) = ".mid" || filename_ext(a) = ".midi") song_midi = a
 	else song_midi = ""
 	// LOOP
-	if(song_nbs_version >= 4){
-	loop = buffer_read_byte()
-	if string_count("format4beta", filename_name(fn)) = 1 {
-	loopstart = buffer_read_byte()
-	loopmax = 0
-	} else {
-		loopmax = buffer_read_byte()
-		loopstart = buffer_read_short()
+	if (song_nbs_version >= 4) {
+		loop = buffer_read_byte()
+		if (string_count("format4beta", filename_name(fn)) = 1) {
+			loopstart = buffer_read_byte()
+			loopmax = 0
+		} else {
+			loopmax = buffer_read_byte()
+			loopstart = buffer_read_short()
 		}
 	}
     // Note blocks
@@ -106,7 +106,7 @@ if (file_ext = ".nbs") {
             if (a = 0) break
             cb += a
             var ins = buffer_read_byte();
-			if(ins >= song_first_custom_index)ins += custom_index_diff //If instrument is custom, add custom_index_diff so it works when adding future instruments
+			if(ins >= song_first_custom_index) ins += custom_index_diff //If instrument is custom, add custom_index_diff so it works when adding future instruments
             var key = buffer_read_byte();
 			if song_nbs_version>=4 {
 				var vel = buffer_read_byte();

scripts/save_settings/save_settings.gml

@@ -1,5 +1,5 @@
 // save_settings()
-var a, b;
+var a;
 
 ini_open(data_directory + "settings.ini")
 
@@ -16,10 +16,11 @@ ini_write_real_clean("preferences", "theme",              theme)
 ini_write_real_clean("preferences", "refresh_rate",       refreshrate)
 ini_write_string(    "preferences", "song_folder",        songfolder)
 ini_write_string(    "preferences", "pattern_folder",     patternfolder)
+ini_write_real_clean("preferences", "draw_type",          draw_type)
 ini_write_real_clean("preferences", "show_numbers",       show_numbers)
 ini_write_real_clean("preferences", "show_octaves",       show_octaves)
 ini_write_real_clean("preferences", "use_fading",         fade)
-ini_write_real_clean("preferences", "draw_type",          draw_type)
+ini_write_real_clean("preferences", "show_layers",        show_layers)
 ini_write_real_clean("preferences", "show_piano",         show_piano)
 ini_write_real_clean("preferences", "keys_to_show",       keysmax)
 ini_write_real_clean("preferences", "show_keynames",      show_keynames)
@@ -35,6 +36,7 @@ ini_write_real_clean("preferences", "marker_end",         marker_end)
 ini_write_real_clean("preferences", "show_layer_volumes", realvolume)
 ini_write_real_clean("preferences", "use_stereo",         realstereo)
 ini_write_real_clean("preferences", "loop_to_bar_end",    looptobarend)
+ini_write_real_clean("preferences", "save_version",       save_version)
 
 // Midi import settings
 ini_write_real_clean("midi_import", "remember",        w_midi_remember)