fix references

mstop4 · mstop4 · commit 2a8cad6c9446 · 2023-03-09T18:04:48.000-05:00
diff --git a/current-scripts/Demos/useful-scripts/scripts/menu_base_functions/menu_base_functions.gml b/current-scripts/Demos/useful-scripts/scripts/menu_base_functions/menu_base_functions.gml
@@ -55,7 +55,7 @@ function handle_selectable_confirm(_item) {
 	}
 
 	if (!_item.silent_on_confirm && audio_exists(cursor_confirm_sfx)) {
-		inst_audio_controller.play_sfx(cursor_confirm_sfx, 1, false);
+		audio_play_sound(cursor_confirm_sfx, 1, false);
 	}
 }
 
@@ -68,7 +68,7 @@ function handle_spinner_confirm(_item) {
 	}
 
 	if (!_item.silent_on_confirm && audio_exists(cursor_confirm_sfx)) {
-		inst_audio_controller.play_sfx(cursor_confirm_sfx, 1, false);
+		audio_play_sound(cursor_confirm_sfx, 1, false);
 	}
 }
 
@@ -91,7 +91,7 @@ function handle_spinner_change(_item, _delta) {
 	}
 		
 	if (!_item.silent_on_change && audio_exists(cursor_change_sfx)) {
-		inst_audio_controller.play_sfx(cursor_change_sfx, 1, false);
+		audio_play_sound(cursor_change_sfx, 1, false);
 	}
 }
 
@@ -111,7 +111,7 @@ function handle_key_config_select(_item, _delta) {
 	} until (_item.current_binding_index == _original_value || _last_pressed.control_type == _binding_info.control_type)
 
 	if (_item.current_binding_index != _original_value && !_item.silent_on_change && audio_exists(cursor_change_sfx)) {
-		inst_audio_controller.play_sfx(cursor_change_sfx, 1, false);
+		audio_play_sound(cursor_change_sfx, 1, false);
 	}
 }
 
@@ -251,7 +251,7 @@ function menu_base_draw_item(_item, _x, _y) {
 				var _item_icon_index = _item.get_icon_index(CONTROL_TYPE.KEYBOARD_AND_MOUSE, i);
 				draw_sprite_ext(keyboard_icons[keyboard_icons_index], _item_icon_index, _cur_x, _y + control_icons_y_offset * control_icons_scale, control_icons_scale, control_icons_scale, 0, c_white, menu_alpha.v);
 				if (_item.locked_kbm_bindings[i]) {
-					draw_sprite_ext(spr_lock, 0,
+					draw_sprite_ext(lock_sprite, 0,
 						_cur_x + keyboard_icons_width[keyboard_icons_index] * control_icons_scale + 24,
 						_y + (control_icons_y_offset + keyboard_icons_half_height[keyboard_icons_index]) * control_icons_scale,
 						control_icons_scale, control_icons_scale, 0, c_white, menu_alpha.v
@@ -286,7 +286,7 @@ function menu_base_draw_item(_item, _x, _y) {
 				var _item_icon_index = _item.get_icon_index(CONTROL_TYPE.GAMEPAD, i);
 				draw_sprite_ext(gamepad_icons[gamepad_icons_index], _item_icon_index, _cur_x, _y + control_icons_y_offset * control_icons_scale, control_icons_scale, control_icons_scale, 0, c_white, menu_alpha.v);
 				if (_item.locked_gamepad_bindings[i]) {
-						draw_sprite_ext(spr_lock, 0,
+						draw_sprite_ext(lock_sprite, 0,
 						_cur_x + gamepad_icons_width[gamepad_icons_index] * control_icons_scale + 24,
 						_y + (control_icons_y_offset + gamepad_icons_half_height[gamepad_icons_index]) * control_icons_scale,
 						control_icons_scale, control_icons_scale, 0, c_white, menu_alpha.v

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ function handle_selectable_confirm(_item) {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`if (!_item.silent_on_confirm && audio_exists(cursor_confirm_sfx)) {`
`58`		`- inst_audio_controller.play_sfx(cursor_confirm_sfx, 1, false);`
	`58`	`+ audio_play_sound(cursor_confirm_sfx, 1, false);`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`@@ -68,7 +68,7 @@ function handle_spinner_confirm(_item) {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`if (!_item.silent_on_confirm && audio_exists(cursor_confirm_sfx)) {`
`71`		`- inst_audio_controller.play_sfx(cursor_confirm_sfx, 1, false);`
	`71`	`+ audio_play_sound(cursor_confirm_sfx, 1, false);`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
`@@ -91,7 +91,7 @@ function handle_spinner_change(_item, _delta) {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`if (!_item.silent_on_change && audio_exists(cursor_change_sfx)) {`
`94`		`- inst_audio_controller.play_sfx(cursor_change_sfx, 1, false);`
	`94`	`+ audio_play_sound(cursor_change_sfx, 1, false);`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
`@@ -111,7 +111,7 @@ function handle_key_config_select(_item, _delta) {`
`111`	`111`	`} until (_item.current_binding_index == _original_value \|\| _last_pressed.control_type == _binding_info.control_type)`
`112`	`112`
`113`	`113`	`if (_item.current_binding_index != _original_value && !_item.silent_on_change && audio_exists(cursor_change_sfx)) {`
`114`		`- inst_audio_controller.play_sfx(cursor_change_sfx, 1, false);`
	`114`	`+ audio_play_sound(cursor_change_sfx, 1, false);`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
`@@ -251,7 +251,7 @@ function menu_base_draw_item(_item, _x, _y) {`
`251`	`251`	`var _item_icon_index = _item.get_icon_index(CONTROL_TYPE.KEYBOARD_AND_MOUSE, i);`
`252`	`252`	`draw_sprite_ext(keyboard_icons[keyboard_icons_index], _item_icon_index, _cur_x, _y + control_icons_y_offset * control_icons_scale, control_icons_scale, control_icons_scale, 0, c_white, menu_alpha.v);`
`253`	`253`	`if (_item.locked_kbm_bindings[i]) {`
`254`		`- draw_sprite_ext(spr_lock, 0,`
	`254`	`+ draw_sprite_ext(lock_sprite, 0,`
`255`	`255`	`_cur_x + keyboard_icons_width[keyboard_icons_index] * control_icons_scale + 24,`
`256`	`256`	`_y + (control_icons_y_offset + keyboard_icons_half_height[keyboard_icons_index]) * control_icons_scale,`
`257`	`257`	`control_icons_scale, control_icons_scale, 0, c_white, menu_alpha.v`
`@@ -286,7 +286,7 @@ function menu_base_draw_item(_item, _x, _y) {`
`286`	`286`	`var _item_icon_index = _item.get_icon_index(CONTROL_TYPE.GAMEPAD, i);`
`287`	`287`	`draw_sprite_ext(gamepad_icons[gamepad_icons_index], _item_icon_index, _cur_x, _y + control_icons_y_offset * control_icons_scale, control_icons_scale, control_icons_scale, 0, c_white, menu_alpha.v);`
`288`	`288`	`if (_item.locked_gamepad_bindings[i]) {`
`289`		`- draw_sprite_ext(spr_lock, 0,`
	`289`	`+ draw_sprite_ext(lock_sprite, 0,`
`290`	`290`	`_cur_x + gamepad_icons_width[gamepad_icons_index] * control_icons_scale + 24,`
`291`	`291`	`_y + (control_icons_y_offset + gamepad_icons_half_height[gamepad_icons_index]) * control_icons_scale,`
`292`	`292`	`control_icons_scale, control_icons_scale, 0, c_white, menu_alpha.v`