Skip to content

Commit 1ba7a3d

Browse files
OctoFlareDevOctoFlareDev
committed
Remove references of schematic import and branch export
1 parent 257624c commit 1ba7a3d

3 files changed

Lines changed: 9 additions & 21 deletions

File tree

‎scripts/control_draw/control_draw.gml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1709,15 +1709,13 @@ function control_draw() {
17091709
"Import...|\\|" +
17101710
inactive(current_song.selected != 0)+"Pattern...|"+
17111711
"MIDI...|"+
1712-
inactive(os_type != os_windows)+"Schematic...|"+
17131712
"Reference audio...|Background image...|/|"+
17141713
"Export...|\\|" +
17151714
inactive(current_song.totalblocks = 0 || ds_list_size(current_song.instrument_list) <= first_custom_index) + icon(icons.INSTRUMENTS) + "Song with custom sounds...|" +
17161715
inactive(current_song.selected = 0)+"Pattern...|" +
17171716
inactive(current_song.totalblocks = 0) + "Audio track...|"+
17181717
inactive(current_song.totalblocks = 0) + "Schematic...|"+
17191718
inactive(current_song.totalblocks = 0) + "Track schematic...|"+
1720-
inactive(current_song.totalblocks = 0) + "Branch schematic...|"+
17211719
inactive(current_song.totalblocks = 0) + "Data pack...|/|-|" +
17221720
get_hotkey("exit") + "$Exit")
17231721
else show_menu_ext("filep", 0, 19, icon(icons.OPEN)+get_hotkey("open_song") + "$Open song...|Recent songs...|\\|" + str + condstr(recent_song[0] != "", "-|Clear recent songs") + condstr(recent_song[0] = "", "^!No recent songs") + "|/|-|"+"Import from MIDI...|Import from schematic...|Import background image...|-|" + get_hotkey("exit") + "$Exit")
@@ -1806,15 +1804,13 @@ function control_draw() {
18061804
"导入......|\\|"+
18071805
inactive(current_song.selected != 0)+"片段......|"+
18081806
"MIDI 文件......|"+
1809-
inactive(os_type != os_windows)+"Schematic 文件......|"+
18101807
"参考音频......|背景图片......|/|"+
18111808
"导出......|\\|"+
18121809
inactive(current_song.totalblocks = 0 || ds_list_size(current_song.instrument_list) <= first_custom_index) + icon(icons.INSTRUMENTS) + "带自定义音色的歌曲......|"+
18131810
inactive(current_song.selected = 0)+"片段......|"+
18141811
inactive(current_song.totalblocks = 0) + "音频文件......|"+
18151812
inactive(current_song.totalblocks = 0) + "结构......|"+
18161813
inactive(current_song.totalblocks = 0) + "直轨结构......|"+
1817-
inactive(current_song.totalblocks = 0) + "分支结构......|"+
18181814
inactive(current_song.totalblocks = 0) + "数据包......|/|-|" +
18191815
get_hotkey("exit") + "$退出")
18201816
else show_menu_ext("filep", 0, 19, icon(icons.OPEN)+get_hotkey("open_song") + "$打开歌曲......|最近歌曲......|\\|" + str + condstr(recent_song[0] != "", "-|清除最近歌曲") + condstr(recent_song[0] = "", "^!无最近歌曲") + "|/|-|"+"从 MIDI 文件导入......|从 Schematic 文件导入......|导入背景图片......|-|" + get_hotkey("exit") + "$退出")

‎scripts/menu_click/menu_click.gml‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,28 +47,24 @@ function menu_click(argument0) {
4747
if (sel = b + 7) open_url(backup_directory)
4848
if (sel = b + 9) pattern_import("")
4949
if (sel = b + 10) open_midi("")
50-
if (sel = b + 11) open_schematic("")
51-
if (sel = b + 12) {
50+
if (sel = b + 11) {
5251
load_reference_audio()
5352
}
54-
if (sel = b + 13) {
53+
if (sel = b + 12) {
5554
var temppath = string(get_open_filename_ext("Image Files (*.png, *.jpg, *.jpeg)|*.png;*.jpg;*.jpeg", "", "", condstr(language != 1, "Open background image", "打开背景图片")))
5655
wallpaper_init(temppath)
5756
}
58-
if (sel = b + 15) save_song_zip("")
59-
if (sel = b + 16) pattern_export("")
60-
if (sel = b + 17) window = w_mp3_export
61-
if (sel = b + 18) {
57+
if (sel = b + 14) save_song_zip("")
58+
if (sel = b + 15) pattern_export("")
59+
if (sel = b + 16) window = w_mp3_export
60+
if (sel = b + 17) {
6261
if (calculate_size()) window = w_schematic_export
6362
}
64-
if (sel = b + 19) {
63+
if (sel = b + 18) {
6564
if (calculate_size()) window = w_track_export
6665
}
67-
if (sel = b + 20) {
68-
if (calculate_size()) window = w_branch_export
69-
}
70-
if(sel = b + 21) window = w_datapack_export
71-
if (sel = b + 22) game_end()
66+
if(sel = b + 19) window = w_datapack_export
67+
if (sel = b + 20) game_end()
7268
break
7369
}
7470
case "edit": {

‎scripts/menu_macos_init/menu_macos_init.gml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,13 @@ function menu_macos_init(){
9898
"Import...|\\|" +
9999
inactive(current_song.selected != 0)+"Pattern...|"+
100100
"MIDI...|"+
101-
inactive(os_type != os_windows)+"Schematic...|"+
102101
"Reference audio...|Background image...|/|"+
103102
"Export...|\\|" +
104103
inactive(current_song.totalblocks = 0 || ds_list_size(current_song.instrument_list) <= first_custom_index) + icon_menubar(icons.INSTRUMENTS) + "Song with custom sounds...|" +
105104
inactive(current_song.selected = 0)+"Pattern...|" +
106105
inactive(current_song.totalblocks = 0) + "Audio track...|"+
107106
inactive(current_song.totalblocks = 0) + "Schematic...|"+
108107
inactive(current_song.totalblocks = 0) + "Track schematic...|"+
109-
inactive(current_song.totalblocks = 0) + "Branch schematic...|"+
110108
inactive(current_song.totalblocks = 0) + "Data pack...")
111109
else macos_create_menu_ext("File", "filep", icon_menubar(icons.OPEN)+get_hotkey_menubar("open_song") + "$Open song...|Recent songs...|\\|" + str + condstr(recent_song[0] != "", "-|Clear recent songs") + condstr(recent_song[0] = "", "^!No recent songs") + "|/|-|"+"Import from MIDI...|Import from schematic...|Import background image...|-|" + get_hotkey_menubar("exit") + "$Exit")
112110

@@ -204,15 +202,13 @@ function menu_macos_init(){
204202
"导入......|\\|"+
205203
inactive(current_song.selected != 0)+"片段......|"+
206204
"MIDI 文件......|"+
207-
inactive(os_type != os_windows)+"Schematic 文件......|"+
208205
"参考音频......|背景图片......|/|"+
209206
"导出......|\\|"+
210207
inactive(current_song.totalblocks = 0 || ds_list_size(current_song.instrument_list) <= first_custom_index) + icon_menubar(icons.INSTRUMENTS) + "带自定义音色的歌曲......|"+
211208
inactive(current_song.selected = 0)+"片段......|"+
212209
inactive(current_song.totalblocks = 0) + "音频文件......|"+
213210
inactive(current_song.totalblocks = 0) + "结构......|"+
214211
inactive(current_song.totalblocks = 0) + "直轨结构......|"+
215-
inactive(current_song.totalblocks = 0) + "分支结构......|"+
216212
inactive(current_song.totalblocks = 0) + "数据包......")
217213
else macos_create_menu_ext("文件", "filep", icon_menubar(icons.OPEN)+get_hotkey_menubar("open_song") + "$打开歌曲......|最近歌曲......|\\|" + str + condstr(recent_song[0] != "", "-|清除最近歌曲") + condstr(recent_song[0] = "", "^!无最近歌曲") + "|/|-|"+"从 MIDI 文件导入......|从 Schematic 文件导入......|导入背景图片......|-|" + get_hotkey_menubar("exit") + "$退出")
218214

0 commit comments

Comments
 (0)