Work on pickups and multiplayer
This commit is contained in:
@@ -56,13 +56,13 @@ func spawn_players_singleplayer() -> void:
|
||||
var pc : PawnController = pawn_controller.instantiate()
|
||||
pawns[1] = pc
|
||||
pawns_node.add_child(pc,true)
|
||||
var position : Vector3
|
||||
var pos : Vector3
|
||||
if(spawn_points == null
|
||||
or len(spawn_points) <= 1):
|
||||
position = Vector3(0,0,0)
|
||||
pos = Vector3(0,0,0)
|
||||
else:
|
||||
position = spawn_points[0].global_position
|
||||
pc.global_position = position
|
||||
pos = spawn_points[0].global_position
|
||||
pc.global_position = pos
|
||||
pc.setup(1, Game.pawns_selected[1])
|
||||
add_pawn_camera(pc)
|
||||
cameras[1].register_pawn(1)
|
||||
@@ -83,17 +83,17 @@ func spawn_players_multiplayer() -> void:
|
||||
|
||||
for key in pawns:
|
||||
var pc = pawns[key]
|
||||
var position : Vector3
|
||||
var pos : Vector3
|
||||
if(spawn_points == null
|
||||
or len(spawn_points) <= count):
|
||||
if key == Multiplayer.id:
|
||||
position = Vector3(0,0,0)
|
||||
pos = Vector3(0,0,0)
|
||||
else:
|
||||
position = Vector3(3,0,0)
|
||||
pos = Vector3(3,0,0)
|
||||
else:
|
||||
position = spawn_points[count].global_position
|
||||
pos = spawn_points[count].global_position
|
||||
count += 1
|
||||
pc.global_position = position
|
||||
pc.global_position = pos
|
||||
pc.setup.rpc(key, Game.pawns_selected[key])
|
||||
|
||||
multiplayer_level_setup.set_players_unready(Multiplayer.players.values())
|
||||
@@ -198,7 +198,7 @@ func remove_map_marker(target) -> void:
|
||||
|
||||
func add_map_marker(target) -> void:
|
||||
var marker : MapMarker
|
||||
var height : float
|
||||
var height : float = 0
|
||||
if target is PawnController:
|
||||
marker = map_marker_templates.pawn.instantiate()
|
||||
height += 40
|
||||
|
||||
Reference in New Issue
Block a user