diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-06-25 15:22:03 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-06-25 15:22:03 +0200 |
| commit | f961c1f8d25f479d8b91ac537f3a91ab0adc68b1 (patch) | |
| tree | faf6a3297bdaa449b70a18db8e0d1d2132b99dd0 /client/player | |
| parent | fb063266454462571596931b40560bf3992f7f16 (diff) | |
| parent | 4c6b38bb85d5211df01ee4f9e14a613dbe21be6d (diff) | |
| download | hurrycurry-f961c1f8d25f479d8b91ac537f3a91ab0adc68b1.tar hurrycurry-f961c1f8d25f479d8b91ac537f3a91ab0adc68b1.tar.bz2 hurrycurry-f961c1f8d25f479d8b91ac537f3a91ab0adc68b1.tar.zst | |
Merge branch 'master' of codeberg.org:metamuffin/undercooked
Diffstat (limited to 'client/player')
| -rw-r--r-- | client/player/controllable_player.gd | 2 | ||||
| -rw-r--r-- | client/player/player.gd | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/client/player/controllable_player.gd b/client/player/controllable_player.gd index a85d6c84..7d143a60 100644 --- a/client/player/controllable_player.gd +++ b/client/player/controllable_player.gd @@ -97,7 +97,7 @@ func update_position(new_position: Vector2, _new_rotation: float): func interact(): var tile_idx = str(target) - var t: Floor = game.map.tile_by_pos.get(tile_idx) + var t: Tile = game.map.tile_by_pos.get(tile_idx) if t != null: game.marker.set_interactive(game.mp.get_tile_interactive(target)) game.marker.visible = true diff --git a/client/player/player.gd b/client/player/player.gd index 41ba1059..5873c9ef 100644 --- a/client/player/player.gd +++ b/client/player/player.gd @@ -66,13 +66,13 @@ func remove_item() -> Item: character.holding = false return i -func take_item(tile: Floor): +func take_item(tile: Tile): if hand != null: push_error("already holding an item") var i = tile.take_item() set_item(i) -func put_item(tile: Floor): +func put_item(tile: Tile): var i = remove_item() tile.put_item(i) |