From f1eb6de1d0747ee32e9ce7e7b42353439f97d79f Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Tue, 19 Nov 2019 22:40:34 +0100 Subject: [PATCH] Fix a variable shadowing warning This warning was reported by Godot 3.2 thanks to its new variable shadowing warning. --- Scripts/Canvas.gd | 4 ++-- Scripts/FrameButton.gd | 2 +- Scripts/HorizontalRuler.gd | 2 +- Scripts/LayerContainer.gd | 2 +- Scripts/VerticalRuler.gd | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Scripts/Canvas.gd b/Scripts/Canvas.gd index fae9f743b..9e9feabd7 100644 --- a/Scripts/Canvas.gd +++ b/Scripts/Canvas.gd @@ -652,8 +652,8 @@ func point_in_rectangle(p : Vector2, coord1 : Vector2, coord2 : Vector2) -> bool return p.x > coord1.x && p.y > coord1.y && p.x < coord2.x && p.y < coord2.y #Returns the position in the middle of a rectangle -func rectangle_center(pos : Vector2, size : Vector2) -> Vector2: - return (pos - size / 2).floor() +func rectangle_center(rect_position : Vector2, rect_size : Vector2) -> Vector2: + return (rect_position - rect_size / 2).floor() func _on_Timer_timeout() -> void: Global.can_draw = true diff --git a/Scripts/FrameButton.gd b/Scripts/FrameButton.gd index 709b409f2..2d17bc3b5 100644 --- a/Scripts/FrameButton.gd +++ b/Scripts/FrameButton.gd @@ -119,4 +119,4 @@ func change_frame_order(rate : int) -> void: Global.undo_redo.add_undo_method(Global, "undo", [Global.canvases[frame]]) Global.undo_redo.add_do_method(Global, "redo", [Global.canvases[frame]]) - Global.undo_redo.commit_action() \ No newline at end of file + Global.undo_redo.commit_action() diff --git a/Scripts/HorizontalRuler.gd b/Scripts/HorizontalRuler.gd index 854b8c0b9..1d863dffc 100644 --- a/Scripts/HorizontalRuler.gd +++ b/Scripts/HorizontalRuler.gd @@ -51,4 +51,4 @@ func _draw() -> void: if i % minor_subdivision == 0: draw_line(Vector2(position.x + RULER_WIDTH, RULER_WIDTH * 0.33), Vector2(position.x + RULER_WIDTH, RULER_WIDTH), Color.white) else: - draw_line(Vector2(position.x + RULER_WIDTH, RULER_WIDTH * 0.66), Vector2(position.x + RULER_WIDTH, RULER_WIDTH), Color.white) \ No newline at end of file + draw_line(Vector2(position.x + RULER_WIDTH, RULER_WIDTH * 0.66), Vector2(position.x + RULER_WIDTH, RULER_WIDTH), Color.white) diff --git a/Scripts/LayerContainer.gd b/Scripts/LayerContainer.gd index 0f2b65f68..c8e1f43e2 100644 --- a/Scripts/LayerContainer.gd +++ b/Scripts/LayerContainer.gd @@ -65,4 +65,4 @@ func _on_VisibilityButton_pressed() -> void: func _on_LineEdit_text_changed(new_text : String) -> void: Global.canvas.layers[i][2] = new_text - $HBoxContainer/Label.text = new_text \ No newline at end of file + $HBoxContainer/Label.text = new_text diff --git a/Scripts/VerticalRuler.gd b/Scripts/VerticalRuler.gd index 1cc924eb2..0511c6345 100644 --- a/Scripts/VerticalRuler.gd +++ b/Scripts/VerticalRuler.gd @@ -51,4 +51,4 @@ func _draw() -> void: if i % minor_subdivision == 0: draw_line(Vector2(RULER_WIDTH * 0.33, position.y), Vector2(RULER_WIDTH, position.y), Color.white) else: - draw_line(Vector2(RULER_WIDTH * 0.66, position.y), Vector2(RULER_WIDTH, position.y), Color.white) \ No newline at end of file + draw_line(Vector2(RULER_WIDTH * 0.66, position.y), Vector2(RULER_WIDTH, position.y), Color.white)