simplify code

unknown-horizons · Jan 24, 2024 · dcf4b61 · dcf4b61
1 parent 0dbe3c1
commit dcf4b61
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/Assets/UI/TabWidgets/Buttons/MainButton/MainButtons/ZoomButton.gd b/Assets/UI/TabWidgets/Buttons/MainButton/MainButtons/ZoomButton.gd
@@ -5,17 +5,17 @@ enum ZOOM_DIRECTION {IN, OUT}
 @export var zoom_direction: ZOOM_DIRECTION
 
 func _ready() -> void:
-	pressed.connect(Callable(self, "_on_ZoomButton_pressed"))
+	pressed.connect(_on_ZoomButton_pressed)
 
 	if zoom_direction == ZOOM_DIRECTION.IN:
-		Global.camera_max_zoom.connect(Callable(self, "_on_camera_min_max_zoom"))
+		Global.camera_max_zoom.connect(_on_camera_min_max_zoom)
 	elif zoom_direction == ZOOM_DIRECTION.OUT:
-		Global.camera_min_zoom.connect(Callable(self, "_on_camera_min_max_zoom"))
+		Global.camera_min_zoom.connect(_on_camera_min_max_zoom)
 
-func _on_camera_min_max_zoom(value: bool):
-	disabled = value
+func _on_camera_min_max_zoom(is_limit_reached: bool):
+	disabled = is_limit_reached
 
-func _on_ZoomButton_pressed():
+func _on_ZoomButton_pressed() -> void:
 	if zoom_direction == ZOOM_DIRECTION.IN:
 		Global.emit_signal("camera_zoom_in")
 	elif zoom_direction == ZOOM_DIRECTION.OUT:

diff --git a/Assets/World/Global.gd b/Assets/World/Global.gd
@@ -4,8 +4,8 @@ signal camera_rotate_left
 signal camera_rotate_right
 signal camera_zoom_in
 signal camera_zoom_out
-signal camera_max_zoom(flag)
-signal camera_min_zoom(flag)
+signal camera_max_zoom(is_limit_reached: bool)
+signal camera_min_zoom(is_limit_reached: bool)
 
 enum WindowMode {
 	WINDOWED,

diff --git a/Assets/World/WorldThing.gd b/Assets/World/WorldThing.gd
@@ -43,8 +43,8 @@ func _ready() -> void:
 	set_rotation_degree(rotation_degree)
 
 	if not Engine.is_editor_hint():
-		Global.camera_rotate_left.connect(Callable(self, "_on_camera_rotate_left"))
-		Global.camera_rotate_right.connect(Callable(self, "_on_camera_rotate_right"))
+		Global.camera_rotate_left.connect(_on_camera_rotate_left)
+		Global.camera_rotate_right.connect(_on_camera_rotate_right)
 
 func _process(_delta: float) -> void:
 	if Engine.is_editor_hint():