From 68a1458abd6440c03a7d7211249999851524c0fc Mon Sep 17 00:00:00 2001
From: kreatordxx <>
Date: Sat, 27 Mar 2010 02:54:41 +0000
Subject: [PATCH] Initialise 'playing' to 0 for UDP kmatrix, making sure player
 progresses to next level; always return 1 when starting to join a UDP game so
 it doesn't immediately return to the main menu

---
 CHANGELOG.txt  |  4 ++++
 main/kmatrix.c |  2 ++
 main/net_udp.c | 10 +++-------
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index fc7e84c9d..7edd6efac 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D1X-Rebirth Changelog
 
+20100327
+--------
+main/kmatrix.c, main/net_udp.c: Initialise 'playing' to 0 for UDP kmatrix, making sure player progresses to next level; always return 1 when starting to join a UDP game so it doesn't immediately return to the main menu
+
 20100326
 --------
 main/endlevel.c, main/gameseq.c, main/mission.c, main/mission.h, main/titles.c, main/titles.h: In Endlevel sequence, re-align big explosion to draw in front of exit model, relative to viewer; Re-organized tex files for Briefings and Endings and created more general code to play them; Re-aligned Dravis' head
diff --git a/main/kmatrix.c b/main/kmatrix.c
index 076552bde..8925e7cbb 100644
--- a/main/kmatrix.c
+++ b/main/kmatrix.c
@@ -538,6 +538,8 @@ int kmatrix_handler(window *wind, d_event *event, kmatrix_screen *km)
 			if (km->network)
 				multi_do_protocol_frame(0, 1);
 			
+			km->playing = 0;
+
 			// Check if all connected players are also looking at this screen ...
 			for (i = 0; i < MAX_PLAYERS; i++)
 				if (Players[i].connected)
diff --git a/main/net_udp.c b/main/net_udp.c
index 896891555..b52ae3941 100644
--- a/main/net_udp.c
+++ b/main/net_udp.c
@@ -374,13 +374,9 @@ int net_udp_game_connect(manual_join *mj)
 		}
 	}
 		
-	if (net_udp_do_join_game())
-	{
-		mj->connecting = 0;
-		return 1;	// Success!
-	}
-	
-	return 0;
+	mj->connecting = 0;
+
+	return net_udp_do_join_game();
 }
 
 static char *connecting_txt = "Connecting...";