diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-06-22 18:10:07 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-06-23 19:28:39 +0200 |
| commit | e366cfdf9133c0da798352c474580d329c6a0f33 (patch) | |
| tree | 1cb97c585cd7c457f3205cacc36cdd183883ac5f /client/scripts/game.gd | |
| parent | 512ea1fce397549e2dd2f2b24adde5bc074b4ad2 (diff) | |
| download | hurrycurry-e366cfdf9133c0da798352c474580d329c6a0f33.tar hurrycurry-e366cfdf9133c0da798352c474580d329c6a0f33.tar.bz2 hurrycurry-e366cfdf9133c0da798352c474580d329c6a0f33.tar.zst | |
player collisions and better movement code
Diffstat (limited to 'client/scripts/game.gd')
| -rw-r--r-- | client/scripts/game.gd | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/client/scripts/game.gd b/client/scripts/game.gd index 9e02e7c0..48457f9c 100644 --- a/client/scripts/game.gd +++ b/client/scripts/game.gd @@ -1,3 +1,4 @@ +class_name Game extends Node3D @onready var camera: FollowCamera = $FollowCamera @@ -13,12 +14,10 @@ func _ready(): func(player: int, name: String, pos: Vector2, character: int): var player_instance: Player if player == Multiplayer.player_id: - player_instance = ControllablePlayer.new(player, name, pos, character) - player_instance.camera = camera - player_instance.map = map + player_instance = ControllablePlayer.new(player, name, pos, character, self) camera.target = player_instance else: - player_instance = Player.new(player, name, pos, character) + player_instance = Player.new(player, name, pos, character, self) players[player] = player_instance add_child(player_instance) ) |