refs #37: Removed leftovers after squashing and rebasing over 2.0

carenalgas · Dec 27, 2023 · baa74a4 · baa74a4
1 parent 4c85e77
commit baa74a4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/addons/popochiu/editor/factories/factory_popochiu_room.gd b/addons/popochiu/editor/factories/factory_popochiu_room.gd
@@ -50,7 +50,7 @@ func create(obj_name: String, set_as_main:bool = false) -> int:
 	# Changed _set_as_main_check.pressed to _set_as_main_check.button_pressed
 	# in order to fix #56
 	if set_as_main:
-		_main_dock.set_main_scene( _scene.scene)
+		_main_dock.set_main_scene( _scene.scene_file_path)
 		# TODO: next line should be in set_main_scene() function!
 		_dock_row.is_main = true # So the Heart icon shows
 	# ▓▓▓ LOCAL CODE ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓

diff --git a/addons/popochiu/engine/objects/graphic_interface/history/components/dialog_line.tscn b/addons/popochiu/engine/objects/graphic_interface/history/components/dialog_line.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://b6dm3xvvr7dvi"]
 
-[ext_resource type="FontFile" uid="uid://c7ig50my7y048" path="res://addons/popochiu/fonts/monkeyisland_1991.ttf" id="1_o6vvl"]
+[ext_resource type="FontFile" uid="uid://dixh1egf7k2fb" path="res://addons/popochiu/fonts/monkeyisland_1991.ttf" id="1_o6vvl"]
 
 [node name="DialogLine" type="Label"]
 anchors_preset = 15

diff --git a/addons/popochiu/engine/objects/graphic_interface/history/components/interaction_line.tscn b/addons/popochiu/engine/objects/graphic_interface/history/components/interaction_line.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://2mnjw3qsi8hc"]
 
-[ext_resource type="FontFile" uid="uid://c7ig50my7y048" path="res://addons/popochiu/fonts/monkeyisland_1991.ttf" id="1_i1qxr"]
+[ext_resource type="FontFile" uid="uid://dixh1egf7k2fb" path="res://addons/popochiu/fonts/monkeyisland_1991.ttf" id="1_i1qxr"]
 
 [node name="InteractionLine" type="Label"]
 anchors_preset = 15

diff --git a/addons/popochiu/popochiu_plugin.gd b/addons/popochiu/popochiu_plugin.gd
@@ -415,7 +415,6 @@ func _create_container_buttons() -> void:
 	_btn_interaction_polygon.add_theme_stylebox_override('hover', _tool_btn_stylebox)
 	_btn_interaction_polygon.pressed.connect(_select_interaction_polygon)
 
-	hbox.add_child(_vsep)
 	hbox.add_child(_btn_baseline)
 	hbox.add_child(_btn_walk_to)
 	hbox.add_child(_btn_interaction_polygon)
@@ -425,7 +424,6 @@ func _create_container_buttons() -> void:
 		hbox
 	)
 
-	_vsep.hide()
 	_btn_baseline.hide()
 	_btn_walk_to.hide()
 
@@ -465,7 +463,6 @@ func _select_interaction_polygon() -> void:
 	_btn_walk_to.set_pressed_no_signal(false)
 	_btn_baseline.set_pressed_no_signal(false)
 	_btn_interaction_polygon.set_pressed_no_signal(true)
-	_vsep.hide()
 
 	var collision_polygon: CollisionPolygon2D = null