From bcc939df1cbef9da5fc5248cde6762f4bcf61055 Mon Sep 17 00:00:00 2001 From: yuki Date: Wed, 19 Nov 2025 16:43:39 -0300 Subject: [PATCH] forgot i stored player and ball scenes inside their spawn markers :p --- classes/level/level.gd | 3 --- scenes/levels/states/level_starting.gd | 7 ++++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/classes/level/level.gd b/classes/level/level.gd index 65e6d54..698fa26 100644 --- a/classes/level/level.gd +++ b/classes/level/level.gd @@ -11,9 +11,6 @@ class_name Level extends Node2D @export var block_layer: BlockTileLayer #@export var goal_layer: GoalTileLayer -@onready var player_scene: PackedScene = preload("res://scenes/player/player.tscn") -@onready var ball_scene: PackedScene = preload("res://scenes/ball/ball.tscn") - var player_1: Player var player_2: Player var ball: Ball diff --git a/scenes/levels/states/level_starting.gd b/scenes/levels/states/level_starting.gd index e7225a9..80562f7 100644 --- a/scenes/levels/states/level_starting.gd +++ b/scenes/levels/states/level_starting.gd @@ -40,7 +40,7 @@ func _enter(_previous_state_path: String, _data: Dictionary = {"round": 0, "rest func _instantiate_player(id: int) -> Player: var s: PlayerSpawnPoint = level.player_1_spawn if id == 1 else level.player_2_spawn - var p: Player = level.player_scene.instantiate() + var p: Player = s.player_scene.instantiate() p.id = id p.name = "Player"+str(id) @@ -54,10 +54,11 @@ func _instantiate_player(id: int) -> Player: func _instantiate_ball() -> Ball: - var b: Ball = level.ball_scene.instantiate() + var s: BallSpawnPoint = level.ball_spawn + var b: Ball = s.ball_scene.instantiate() level.add_child(b) - b.global_position = level.ball_spawn.global_position + b.global_position = s.global_position return b