diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/global.gd | 1 | ||||
| -rw-r--r-- | client/menu/scroll_container_custom.gd | 2 | ||||
| -rw-r--r-- | client/multiplayer.gd | 12 |
3 files changed, 7 insertions, 8 deletions
diff --git a/client/global.gd b/client/global.gd index 7b76788d..d944673c 100644 --- a/client/global.gd +++ b/client/global.gd @@ -251,7 +251,6 @@ func on_mobile() -> bool: return os_name == "Android" or os_name == "iOS" func on_high_end() -> bool: - var os_name := OS.get_name() if on_mobile(): return false return on_vulkan() diff --git a/client/menu/scroll_container_custom.gd b/client/menu/scroll_container_custom.gd index b3ce4e46..73780ae2 100644 --- a/client/menu/scroll_container_custom.gd +++ b/client/menu/scroll_container_custom.gd @@ -23,7 +23,7 @@ var velocity := 0. func _process(delta): velocity = G.interpolate(velocity, 0., delta * 5.) - velocity = 0 if abs(velocity) < .001 else velocity + velocity = 0. if abs(velocity) < .001 else velocity if Input.get_axis("scroll_up", "scroll_down") != 0.: velocity = Input.get_axis("scroll_up", "scroll_down") set_deferred("scroll_vertical", scroll_vertical + velocity * delta * SCROLL_SPEED) diff --git a/client/multiplayer.gd b/client/multiplayer.gd index 6fc5a4c2..dad4464d 100644 --- a/client/multiplayer.gd +++ b/client/multiplayer.gd @@ -20,13 +20,13 @@ extends Node signal init(player_id: int) signal data( - item_names: Array, - tile_names: Array, - tile_collide: Array, - tile_interact: Array, - map_names: Array + item_names: Array[String], + tile_names: Array[String], + tile_collide: Array[String], + tile_interact: Array[String], + map_names: Array[String] ) -signal set_tile(tile: Vector2i, kind: int, neighbors: Array) +signal set_tile(tile: Vector2i, kind: int, neighbors: Array[String]) signal remove_tile(tile: Vector2i) signal clear_message(player: int) signal text_message(player: int, text: String, persist: bool) |