Merge branch 'master' of github.com:unfa/jam-01 into master

Assets/Weapons/Weapon.gd

@@ -12,7 +12,6 @@ export(int) var MaxRoundsInClip = 10
 export(int) var Clips = 1
 export(int) var MaxClips = 4
 
-onready var camera = get_parent().get_parent()
 onready var player = get_parent().get_parent().get_parent()
 
 onready var ejector = find_node("Ejector")
@@ -64,6 +63,7 @@ func shoot(camera):
 			
 			if hit is preload("res://Player.gd"):
 				emit_signal("damage_dealt")
+				print(player.get_network_master())
 	else:
 		rpc("dry_fire")
 	
@@ -121,7 +121,8 @@ remote func compute_bullet_flyby():
 	var from = global_transform.xform(Vector3())
 	var to = global_transform.xform(Vector3(-1000, 0, 0))
 	
-	local_player.on_bullet_flyby(from, to)
+	if local_player:
+		local_player.on_bullet_flyby(from, to)
 
 func reload():
 	rpc("play_reload_animation")

Game.gd

@@ -16,7 +16,7 @@ var settingmap = {
 	"nickname": "set_nickname"
 }
 
-onready var peer = NetworkedMultiplayerENet.new()
+var peer = NetworkedMultiplayerENet.new()
 var local_player = null setget set_local_player
 
 func set_local_player(player):
@@ -206,6 +206,9 @@ func free_client():
 		player_list_item.queue_free()
 	
 	peer.close_connection()
+	
+	get_tree().network_peer = null
+	local_player = null
 
 func quit():
 	get_tree().quit()
@@ -222,7 +225,7 @@ func get_player_data():
 	
 	return player_data
 
-sync func check_players(player_data):
+remote func check_players(player_data):
 	for player_name in player_data:
 		if not $Players.has_node(player_name):
 			var player = player_scene.instance()
@@ -281,8 +284,6 @@ master func set_player_data(player_data):
 	check_players(player_data)
 	var new_player_data = get_player_data()
 	
-	print(new_player_data)
-	
 	rpc("check_players", new_player_data)
 
 func on_peer_disconnected(id):
@@ -291,6 +292,7 @@ func on_peer_disconnected(id):
 	rpc("remove_player", id)
 
 func on_connection_established():
+	print("connection_established")
 	join_game()
 
 func on_connection_failed():

Player.gd

@@ -53,7 +53,6 @@ onready var nickname = "guest" setget set_nickname
 func set_health(value):
 	health = value
 	$HUD.updateHealth(value)
-	print(value)
 	$Billboard.rpc("set_health", value)
 	#$Billboard.set_health(value)
 
@@ -175,7 +174,6 @@ func _physics_process(delta):
 	rset("translation", translation)
 
 master func on_hit(damage, location):
-	
 	set_health(health - 30)
 	
 	rpc("blood_splatter", location)
@@ -274,7 +272,6 @@ func reload():
 	weapon.reload()
 
 func _input(event):
-	
 	if is_dead:
 		return
 	
@@ -339,8 +336,6 @@ func _ready():
 	# only show the debug label on local machine
 	if name != String(get_tree().get_network_unique_id()):
 		debug.hide()
-		print(get_tree().get_network_unique_id())
-		print(name)
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 #func _process(delta):