fixed so that the server reports gametype, progression and password protection correctly

2 files changed, 26 insertions, 4 deletions

diff --git a/src/engine/interface.h b/src/engine/interface.h
index 9dd0446f..80d72abd 100644
--- a/src/engine/interface.h
+++ b/src/engine/interface.h
@@ -761,7 +761,8 @@ const char *mods_net_version();
 int server_getclientinfo(int client_id, CLIENT_INFO *info);
 const char *server_clientname(int client_id);
 void server_setclientname(int client_id, const char *name);
-void server_setprogression(int v);
+
+void server_setbrowseinfo(int game_type, int progression);
 
 int server_tick();
 int server_tickspeed();
diff --git a/src/engine/server/server.c b/src/engine/server/server.c
index 08c4ad3c..f26a51c5 100644
--- a/src/engine/server/server.c
+++ b/src/engine/server/server.c
@@ -25,6 +25,9 @@ static SNAPBUILD builder;
 static int64 game_start_time;
 static int current_tick = 0;
 
+static int browseinfo_gametype = -1;
+static int browseinfo_progression = -1;
+
 static int64 lastheartbeat;
 static NETADDR4 master_server;
 
@@ -176,6 +179,12 @@ void server_setclientname(int client_id, const char *name)
 	strncpy(clients[client_id].name, name, MAX_NAME_LENGTH);
 }
 
+void server_setbrowseinfo(int game_type, int progression)
+{
+	browseinfo_gametype = game_type;
+	browseinfo_progression = progression;
+}
+
 int server_tick()
 {
 	return current_tick;
@@ -534,9 +543,21 @@ static void server_send_serverinfo(NETADDR4 *addr)
 	packer_add_string(&p, mods_net_version(), 32);
 	packer_add_string(&p, config.sv_name, 64);
 	packer_add_string(&p, config.sv_map, 32);
-	packer_add_string(&p, "0", 2); /* gametype */
-	packer_add_string(&p, "0", 2); /* flags */
-	packer_add_string(&p, "0", 4); /* progression */
+
+	/* gametype */
+	sprintf(buf, "%d", browseinfo_gametype);
+	packer_add_string(&p, buf, 2);
+
+	/* flags */
+	i = 0;
+	if(strlen(config.password))
+		i |= 1;
+	sprintf(buf, "%d", i);
+	packer_add_string(&p, buf, 2);
+
+	/* progression */
+	sprintf(buf, "%d", browseinfo_progression);
+	packer_add_string(&p, buf, 4);
 	
 	sprintf(buf, "%d", c); packer_add_string(&p, buf, 3);  /* num players */
 	sprintf(buf, "%d", netserver_max_clients(net)); packer_add_string(&p, buf, 3); /* max players */