From 431acfc39d155ab791778a64a69a72ae4f71b7d2 Mon Sep 17 00:00:00 2001
From: avolkov <avolkov@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Mon, 21 Feb 2011 14:41:18 +0000
Subject: [PATCH] Build fleet queues and name captains in the same exact order
 on both net sides; fixes bugs 1081 and 989

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3570 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/ChangeLog                     | 2 ++
 sc2/src/uqm/supermelee/pickmele.c | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index 1b65d91d7..b5bddc7ab 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,6 @@
 Changes towards version 0.7:
+- Same captain names are used on both net sides (bug #989) - Alex
+- Fixed sync loss in netplay games having duplicate ships (bug #1081) - Alex
 - Fixed loading of melee.cfg (bug #1099) - Alex
 - Fixed the 64KB size limitation on key-value files (bug #1112) - Alex
 - Update download paths for the new SourceForge File Release system - Michael
diff --git a/sc2/src/uqm/supermelee/pickmele.c b/sc2/src/uqm/supermelee/pickmele.c
index bf5248321..ea600a789 100644
--- a/sc2/src/uqm/supermelee/pickmele.c
+++ b/sc2/src/uqm/supermelee/pickmele.c
@@ -507,20 +507,22 @@ BuildPickMeleeFrame (void)
 void
 FillPickMeleeFrame (MeleeSetup *setup)
 {
-	COUNT sideI;
+	COUNT i;
 	CONTEXT OldContext;
 
 	OldContext = SetContext (OffScreenContext);
 
-	for (sideI = 0; sideI < NUM_SIDES; ++sideI)
+	for (i = 0; i < NUM_SIDES; ++i)
 	{
 		COUNT side;
+		COUNT sideI;
 		RECT r;
 		TEXT t;
 		STAMP s;
 		UNICODE buf[30];
 		FleetShipIndex index;
 
+		sideI = GetPlayerOrder (i);
 		side = !sideI;
 
 		s.frame = SetAbsFrameIndex (PickMeleeFrame, side);