From 33a6de2c061b3b1aa24d00ac2173daea25413251 Mon Sep 17 00:00:00 2001
From: Luna <judahiii@gmail.com>
Date: Mon, 28 May 2018 18:46:29 -0400
Subject: [PATCH] Start skirmish server automatically

---
 scripts/matchmaking.gd | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/scripts/matchmaking.gd b/scripts/matchmaking.gd
index 0528467..2f40444 100644
--- a/scripts/matchmaking.gd
+++ b/scripts/matchmaking.gd
@@ -38,7 +38,7 @@ func start_matchmaker():
 	set_process(true)
 
 	# Setup skirmish server
-	skirmish = spawn_server()
+	skirmish = spawn_server(true)
 
 	# Set up communication between GAMESERVERS
 	# This is necessary for eg, when a player leaves to backfill
@@ -94,8 +94,12 @@ func check_queue():
 		spawn_server()
 		# games.append(port)
 
-func spawn_server():
-	OS.execute("util/server.sh", ['-port='+str(next_port)], false)
+func spawn_server(skirmish=false):
+	var args = ['-port='+str(next_port)]
+	if skirmish:
+		# Begin skirmish immediately, so players "join" instead of "ready"
+		args.append("-start-game")
+	OS.execute("util/server.sh", args, false)
 	next_port += 1
 	return (next_port - 1) # Return original port