From e366cfdf9133c0da798352c474580d329c6a0f33 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sat, 22 Jun 2024 18:10:07 +0200 Subject: player collisions and better movement code --- client/scripts/game.gd | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'client/scripts/game.gd') 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) ) -- cgit v1.2.3-70-g09d2