diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-07-08 19:41:00 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-07-08 19:41:00 +0200 |
| commit | c0d4eb9da614c02dc5dc4a15db420014f592ba45 (patch) | |
| tree | bc77af599e36432a0bfbc91d32277b229abdaad4 /client/map | |
| parent | b43be80a63e54948656313d9862e0523a3aed31f (diff) | |
| parent | 606d995ab7ca459593807fc895c1ec39dacac878 (diff) | |
| download | hurrycurry-c0d4eb9da614c02dc5dc4a15db420014f592ba45.tar hurrycurry-c0d4eb9da614c02dc5dc4a15db420014f592ba45.tar.bz2 hurrycurry-c0d4eb9da614c02dc5dc4a15db420014f592ba45.tar.zst | |
Merge branch 'master' of https://codeberg.org/metamuffin/hurrycurry
Diffstat (limited to 'client/map')
| -rw-r--r-- | client/map/items/item.gd | 1 | ||||
| -rw-r--r-- | client/map/tiles/door.gd | 6 | ||||
| -rw-r--r-- | client/map/tiles/wall_tile.gd | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/client/map/items/item.gd b/client/map/items/item.gd index b657e14f..e9671e91 100644 --- a/client/map/items/item.gd +++ b/client/map/items/item.gd @@ -35,6 +35,7 @@ func _init(owned_by_: Node3D): add_child(take_sound) add_child(put_sound) setup_sounds() + @warning_ignore("static_called_on_instance") base.position = base_position() add_child(base) owned_by = owned_by_ diff --git a/client/map/tiles/door.gd b/client/map/tiles/door.gd index b84c224e..086b0081 100644 --- a/client/map/tiles/door.gd +++ b/client/map/tiles/door.gd @@ -19,10 +19,10 @@ extends WallTile func _init(rename: String, neighbors: Array): super(rename, neighbors) - var facing = 0 + var new_facing = 0 for i in range(4): if neighbors[i] == "door": - facing = i - turn_facing(facing) + new_facing = i + turn_facing(new_facing) base.add_child(load("res://map/tiles/door.tscn").instantiate()) diff --git a/client/map/tiles/wall_tile.gd b/client/map/tiles/wall_tile.gd index 94248c03..0f3e6230 100644 --- a/client/map/tiles/wall_tile.gd +++ b/client/map/tiles/wall_tile.gd @@ -43,7 +43,7 @@ func _init(rename: String, neighbors: Array): var series = 0 for i in range(4): var i_name = neighbors[(start + i) % 4] - if is_wall(i_name): + if WallTile.is_wall(i_name): series += 1 else: break |