Minor optimizations to updater

- Add quotation marks to the shell command to allow spaces in the filename
- Draw a placeholder in the download progress bar while the file size isn't retrieved (-.-- instead of 0.00)
- Restore original draw_loading() code (for sure this time)
- Change "Setup" to "Installer" in the filename
- Delete old installers on startup
- Shift some stuff in the startup code
- Restore version number to current version

Author: Bentroen

scripts/control_create/control_create.gml

@@ -333,6 +333,8 @@ save_version = nbs_version
 load_settings()
 change_theme()
 if (show_welcome) window = w_greeting
+
+// Updates
 if (check_update)
     update_http = http_get("https://api.github.com/repos/HielkeMinecraft/OpenNoteBlockStudio/releases/latest")
 else
@@ -344,7 +346,11 @@ if (file_exists_lib(settings_file) && vers != version) {
     window = w_update
     update = 3
 }
-log("Startup OK")
+
+// Delete old installer
+if (file_exists_lib(update_file)) {
+	files_delete_lib(update_file)
+}
 
 // Auto-recovery
 if (file_exists_lib(backup_file)) {
@@ -357,4 +363,6 @@ if (file_exists_lib(backup_file)) {
 if (parameter_count() > 0) {
 	filename = parameter_string(1)
 	if (filename != "") load_song(filename)
-}
+}
+
+log("Startup OK")

scripts/draw_downloadprogress/draw_downloadprogress.gml

@@ -1,5 +1,5 @@
 // draw_downloadprogress(caption, desc, downloaded_size, total_size)
-var caption, desc, done, total, done_mb, total_mb, percent, x1, y1;
+var caption, desc, done, total, done_mb, total_mb, done_text, total_text, text, percent, x1, y1;
 caption = argument0
 desc = argument1
 done = argument2
@@ -21,5 +21,13 @@ draw_rectangle(x1 + 30, y1 + 60, x1 + 30 + percent * 240, y1 + 80, 0)
 draw_theme_color()
 draw_rectangle(x1 + 30, y1 + 60, x1 + 270, y1 + 80, 1)
 if (percent > 0.5) draw_set_color(c_white)
-draw_text(floor(window_width / 2), y1 + 65, string_format(done_mb, 0, 2) + "/" + string_format(total_mb, 0, 2) + " MB (" + string(round(percent * 100)) + "%)")
+if (total <= 0) {
+	done_text = "-.--"
+	total_text = "-.--"
+} else {
+	done_text = string_format(done_mb, 0, 2)
+	total_text = string_format(total_mb, 0, 2)
+}
+text = done_text + "/" + total_text + " MB (" + string(round(percent * 100)) + "%)"
+draw_text(floor(window_width / 2), y1 + 65, text)
 draw_set_halign(fa_left)

scripts/draw_loading/draw_loading.gml

@@ -1,12 +1,8 @@
-// draw_loading(caption, desc, percent)
-var caption, desc, done, total, done_mb, total_mb, percent, x1, y1;
+/*draw_loading(caption, desc, percent)
+var caption, desc, perc, x1, y1;
 caption = argument0
 desc = argument1
-done = argument2
-total = argument3
-percent = done/total
-done_mb = done/power(1024, 2)
-total_mb = total/power(1024, 2)
+perc = argument2
 x1 = floor(window_width / 2 - 150)
 y1 = floor(window_height / 2 - 50)
 draw_theme_color()
@@ -17,9 +13,10 @@ draw_set_font(fnt_main)
 draw_set_halign(fa_center)
 draw_text(floor(window_width / 2), y1 + 40, desc)
 draw_set_color(10512464)
-draw_rectangle(x1 + 30, y1 + 60, x1 + 30 + percent * 240, y1 + 80, 0)
+draw_rectangle(x1 + 30, y1 + 60, x1 + 30 + perc * 240, y1 + 80, 0)
 draw_theme_color()
 draw_rectangle(x1 + 30, y1 + 60, x1 + 270, y1 + 80, 1)
-if (percent > 0.5) draw_set_color(c_white)
-draw_text(floor(window_width / 2), y1 + 65, string_format(done_mb, 0, 2) + "/" + string_format(total_mb, 0, 2) + " MB (" + string(round(percent * 100)) + "%)")
+if (perc > 0.5) draw_set_color(c_white)
+draw_text(floor(window_width / 2), y1 + 65, string(floor(perc * 100)) + "% done")
 draw_set_halign(fa_left)
+screen_refresh()

scripts/get_update/get_update.gml

@@ -15,7 +15,7 @@ if (async_load[? "id"] == update_download) {
 		if (file_get_size(update_file) == total_size) {
 			show_message("Download complete! Click OK to begin installing the update.")
 			// At this point, the game is paused until the user dismisses the message
-			ExecuteShell(update_file, false, true)
+			ExecuteShell("\"" + update_file + "\"", false, true)
 			game_end()
 		} else {
 			if (question("Failed to download update. Do you want to open the Note Block Studio website and update manually?", "Failed")) {

scripts/macros/macros.gml

@@ -1,6 +1,6 @@
 #macro gm_runtime_version "2.2.3.344"
 #macro version_date "2019.12.31"
-#macro version "3.6.0"
+#macro version "3.7.0"
 #macro nbs_version 4
 #macro pat_version 1
 
@@ -14,7 +14,7 @@
 #macro pattern_directory	data_directory + "Patterns\\"
 #macro log_file				file_directory + "log.txt"
 #macro temp_file			file_directory + "tmp.file"
-#macro update_file			file_directory + "Minecraft Note Block Studio Setup.exe"
+#macro update_file			file_directory + "Minecraft Note Block Studio Installer.exe"
 #macro settings_file		file_directory + "settings.ini"
 #macro backup_file			file_directory + "backup.nbs"