diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-09-04 22:12:02 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-09-04 22:12:02 +0200 |
| commit | 5fab354d37476f7339975311a0fe4d5a559065db (patch) | |
| tree | d58a10d24c66291237d1bc4dc026b86f490881bf /client/player | |
| parent | c646336dc3bf470d4185eec995d00a89c420127b (diff) | |
| parent | 9ed1d51ad4abaa114da36e3284c8e29dd07855ad (diff) | |
| download | hurrycurry-5fab354d37476f7339975311a0fe4d5a559065db.tar hurrycurry-5fab354d37476f7339975311a0fe4d5a559065db.tar.bz2 hurrycurry-5fab354d37476f7339975311a0fe4d5a559065db.tar.zst | |
Merge branch 'master' of codeberg.org:hurrycurry/hurrycurry
Diffstat (limited to 'client/player')
| -rw-r--r-- | client/player/controllable_player.gd | 4 | ||||
| -rw-r--r-- | client/player/player.gd | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/client/player/controllable_player.gd b/client/player/controllable_player.gd index c654c070..81315630 100644 --- a/client/player/controllable_player.gd +++ b/client/player/controllable_player.gd @@ -136,8 +136,8 @@ func aabb_point_distance(mi: Vector2, ma: Vector2, p: Vector2) -> float: func update_position(_new_position: Vector2, _new_rotation: float, _new_boosting: bool): pass -func progress(p: float, warn: bool): - super(p, warn) +func progress(position__: float, speed: float, warn: bool): + super(position__, speed, warn) Input.start_joy_vibration(0, 0.5, 0.1, 0.15) func put_item(tile: Tile): diff --git a/client/player/player.gd b/client/player/player.gd index 43d7dd7f..d5837d47 100644 --- a/client/player/player.gd +++ b/client/player/player.gd @@ -107,13 +107,13 @@ func remove_item() -> Item: character.holding = false return i -func progress(p: float, warn: bool): +func progress(position__: float, speed: float, warn: bool): if hand != null: - hand.progress(p, warn) + hand.progress(position__, speed, warn) -func finish(warn: bool): +func finish(): if hand != null: - hand.finish(warn) + hand.finish() func take_item(tile: Tile): if hand != null: |