From 66e63d41a109d85b10396e8a2dd934a829cc57fe Mon Sep 17 00:00:00 2001 From: Hop311 Date: Thu, 13 Apr 2023 19:37:31 +0100 Subject: Small fixes --- game/src/GameSession/MapView.gd | 2 +- game/src/GameSession/Minimap.gd | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'game') diff --git a/game/src/GameSession/MapView.gd b/game/src/GameSession/MapView.gd index 05e77fa..857365b 100644 --- a/game/src/GameSession/MapView.gd +++ b/game/src/GameSession/MapView.gd @@ -241,7 +241,7 @@ func _update_minimap_viewport() -> void: func _update_mouse_map_position() -> void: _mouse_pos_map = _viewport_to_map_coords(_mouse_pos_viewport) var hover_index := MapSingleton.get_province_index_from_uv_coords(_mouse_pos_map) - if not _mouse_over_viewport: + if _mouse_over_viewport: _map_shader_material.set_shader_parameter(_shader_param_hover_index, hover_index) func _on_mouse_entered_viewport(): diff --git a/game/src/GameSession/Minimap.gd b/game/src/GameSession/Minimap.gd index d904b3d..25c7cac 100644 --- a/game/src/GameSession/Minimap.gd +++ b/game/src/GameSession/Minimap.gd @@ -17,11 +17,7 @@ func _draw() -> void: # * SS-81 # * UIFUN-127 func _unhandled_input(event : InputEvent): - if event is InputEventMouseMotion and Input.is_action_pressed(_action_click): - var pos_clicked := get_local_mouse_position() / size - Vector2(0.5, 0.5) - if abs(pos_clicked.x) < 0.5 and abs(pos_clicked.y) < 0.5: - minimap_clicked.emit(pos_clicked) - if event != InputEventMouseMotion and Input.is_action_pressed(_action_click): + if event is InputEventMouse and Input.is_action_pressed(_action_click): var pos_clicked := get_local_mouse_position() / size - Vector2(0.5, 0.5) if abs(pos_clicked.x) < 0.5 and abs(pos_clicked.y) < 0.5: minimap_clicked.emit(pos_clicked) -- cgit v1.2.3-56-ga3b1