Fixed a .osu import tp problems

Trying fixing #18
NagaseIori · Aug 13, 2022 · 4e4b7c1 · 4e4b7c1
1 parent e95a867
commit 4e4b7c1
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 12 deletions.
diff --git a/objects/objmain/Draw_64.gml b/objects/objmain/Draw_64.gml
@@ -9,13 +9,10 @@ if(topBarTimeA > 0) {
 	if(topBarMouseInbound || topBarMousePressed)
 		_ntime = mouse_x / global.resolutionW * musicLength;
 
-	var _ele = scribble(format_time_string(nowTime) + " / "+format_time_string(_ntime))
-		.starting_format("fMono16", c_white)
-		.align(fa_center, fa_top)
-		.blend(c_white, topBarTimeA)
-		.gradient(themeColor, topBarTimeGradA);
-
-	_ele.draw(_nx, _ny);
+	draw_set_font(fMono16);
+	draw_set_color_alpha(merge_color(c_white, themeColor, topBarTimeGradA * 0.5), topBarTimeA);
+	draw_set_halign(fa_center); draw_set_valign(fa_top);
+	draw_text(_nx, _ny, format_time_string(nowTime) + " / "+format_time_string(_ntime))
 }
 
 

diff --git a/objects/objmain/objmain.yy b/objects/objmain/objmain.yy
diff --git a/objects/objmanager/Create_0.gml b/objects/objmanager/Create_0.gml
@@ -15,7 +15,7 @@
 
 global.configPath = program_directory + "config.json";
 
-global.version = "v0.1.2.1"
+global.version = "v0.2.0-dev"
 
 global.resolutionW = 1920
 global.resolutionH = 1080

diff --git a/objects/objmanager/objmanager.yy b/objects/objmanager/objmanager.yy
diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy
diff --git a/scripts/scrEditor/scrEditor.gml b/scripts/scrEditor/scrEditor.gml
@@ -382,7 +382,7 @@ function timing_point_load_from_osz() {
             		break;
                 case "[TimingPoints]":
                     var _time = real(_grid[# 0, i]) + _delay_time;
-                    var _mspb = real(_grid[# 1, i]);
+                    var _mspb = string_letters(_grid[# 1, i]) != ""?-1:real(_grid[# 1, i]);
                     var _meter = real(_grid[# 2, i]);
                     if(_mspb > 0)
                         timing_point_add(_time, _mspb, _meter);