Re-add importing instruments from another song

Updated to be compatible with all NBS versions up to date, which no longer crashes the program.

Author: Bentroen

scripts/draw_window_instruments/draw_window_instruments.gml

@@ -8,7 +8,7 @@ draw_window(x1, y1, x1 + 550, y1 + 350)
 draw_set_font(fnt_mainbold)
 draw_text(x1 + 10, y1 + 8, "Instrument Settings")
 draw_set_font(fnt_main)
-// draw_text(x1 + 12, y1 + 31, "These settings only apply to this song. To import the settings from another\nsong, click \"Import\". The sound files must be located in the \"Sounds\" folder.")
+draw_text(x1 + 12, y1 + 31, "These settings only apply to this song. To import the settings from another\nsong, click \"Import\". The sound files must be located in the \"Sounds\" folder.")
 draw_set_color(c_white)
 if(theme = 2) draw_set_color(c_dark)
 draw_rectangle(x1 + 12, y1 + 66, x1 + 535, y1 + 310, 0)
@@ -32,7 +32,7 @@ draw_text(x1 + 18 + 194, y1 + 70, "Sound")
 draw_window(x1 + 13, y1 + 67, x1 + 14 + 194, y1 + 67 + 20)
 popup_set_window(x1 + 13, y1 + 67, 194, 20, "The name of this instrument.")
 draw_text(x1 + 18, y1 + 70, "Name")
-// if (draw_button2(x1 + 12, y1 + 318, 80, "Import")) load_instruments("")
+if (draw_button2(x1 + 12, y1 + 318, 80, "Import")) load_instruments("")
 c = 0
 if (draw_button2(x1 + 256, y1 + 318, 80, "Add", user_instruments >= 18) && wmenu = 0) {
     changed = true

scripts/load_instruments/load_instruments.gml

@@ -1,69 +1,99 @@
-/// @description  load_instruments(filename)
-/// @function  load_instruments
-/// @param filename
+// load_instruments(filename)
+// Loads custom instruments from a song and adds them to the current song.
 
-var fn, a, b, hei2;
+var fn, a, b, nbsver, height;
 fn = argument0
 if (fn = "") {
     if (!directory_exists_lib(songfolder)) songfolder = songs_directory
     fn = string(get_open_filename_ext("Note Block Songs (*.nbs)|*.nbs", "", songfolder, "Load instruments from song"))
 }
 if (fn = "" || !file_exists_lib(fn)) return 0
-
 buffer = buffer_import(fn)
-buffer_read_short()
-hei2 = buffer_read_short()
+	
+if (buffer_read_short() == 0) {
+	nbsver = buffer_read_byte()
+} else {
+	nbsver = 0
+}
+
+// Future version
+if (nbsver > 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 version " + string(nbs_version) + " file or lower via the Save Options menu.","Error")
+	return -1
+}
+
+// Header
+if (nbsver >= 1) buffer_read_byte()		// Custom instrument index
+if (nbsver >= 3) buffer_read_short()	// Song length
+height = buffer_read_short()
+buffer_read_string_int()	// Song name
+buffer_read_string_int()	// Soung author
+buffer_read_string_int()	// Song original author
+buffer_read_string_int()	// Song description
+buffer_read_short()			// Tempo
+buffer_read_byte()			// Autosave
+buffer_read_byte()			// Autosave minutes
+buffer_read_byte()			// Time signature
+buffer_read_int()			// Minutes spent
+buffer_read_int()			// Left-clicks
+buffer_read_int()			// Right-clicks
+buffer_read_int()			// Blocks added
+buffer_read_int()			// Blocks removed
+buffer_read_string_int()	// MIDI filename
+if (nbsver >= 4) {
+	buffer_read_byte()		// Loop
+	buffer_read_byte()		// Loop count
+	buffer_read_short()		// Loop start tick
+}
 
-buffer_read_string_int()
-buffer_read_string_int()
-buffer_read_string_int()
-buffer_read_string_int()
-buffer_read_short()
-buffer_read_byte()
-buffer_read_byte()
-buffer_read_byte()
-a = buffer_read_int()
-a = buffer_read_int()
-a = buffer_read_int()
-a = buffer_read_int()
-a = buffer_read_int()
-a = buffer_read_string_int()
 // Note blocks
-while (1) {
+while (true) {
     a = buffer_read_short()
     if (a = 0) break
-    while (1) {    
+    while (true) {
         a = buffer_read_short()
         if (a = 0) break
-        repeat (2) buffer_read_byte()
+        buffer_read_byte()		// Instrument
+        buffer_read_byte()		// Key
+		if (nbsver >= 4) {
+			buffer_read_byte()	// Velocity
+			buffer_read_byte()	// Pan
+			buffer_read_short()	// Pitch
+		}
     }
 }
 if (buffer_is_eof()) {
-    message("This file does not contain any custom instruments.", "Error")
-    return 0
+	message("This file does not contain any custom instruments.", "Error")
+	return 0
 }
-//buffer_read_short()
-for (b = 0; b < hei2; b += 1) {
-    buffer_read_string_int()
-     buffer_read_byte()
+
+// Layers
+for (b = 0; b < height; b++) {
+    buffer_read_string_int()			// Layer name
+	if (nbsver >= 4) buffer_read_byte()	// Layer lock
+    buffer_read_byte()					// Layer volume
+	if (nbsver >= 2) buffer_read_byte()	// Layer stereo
 }
 if (buffer_is_eof()) {
-    message("This file does not contain any custom instruments.", "Error")
-    return 0
+	message("This file does not contain any custom instruments.", "Error")
+	return 0
 }
+
+// Instruments
 a = buffer_read_byte()
 if (a = 0) {
     message("This file does not contain any custom instruments.", "Error")
     return 0
 }
-for (b = 0; b < a; b += 1) {
-    var name = buffer_read_string_int();
-    var filename = buffer_read_string_int();
-    var key = buffer_read_byte();
-    var press = buffer_read_byte();
-    var ins = new_instrument(name, filename, true, press, key);
+for (b = 0; b < a; b++) {
+    var name = buffer_read_string_int()
+    var filename = buffer_read_string_int()
+    var key = buffer_read_byte()
+    var press = buffer_read_byte()
+    var ins = new_instrument(name, filename, true, press, key)
     with (ins)
         instrument_load()
     ds_list_add(instrument_list, ins)
 }
 changed = true
+