Index: src/multiint.c
===================================================================
--- src/multiint.c	(revision 6565)
+++ src/multiint.c	(working copy)
@@ -178,7 +178,7 @@
 BOOL			chooseColour		(UDWORD);
 static BOOL		changeReadyStatus	(UBYTE player, BOOL bReady);
 void			resetReadyStatus	(bool bSendOptions);
-
+void			initTeams( void );
 // ////////////////////////////////////////////////////////////////////////////
 // map previews..
 
@@ -2573,6 +2573,18 @@
 }
 
 // ////////////////////////////////////////////////////////////////////////////
+void initTeams()
+{
+	int i;
+
+	for(i=0; i < MAX_PLAYERS; i++)
+	{
+		bTeamChooserUp[i] = false;			// default is all false
+		playerTeam[i] = -1;					//team each player belongs to (in the game) default = -1
+		playerTeamGUI[i] = i;				//team each player belongs to (in skirmish setup screen)
+	}
+
+}
 BOOL startMultiOptions(BOOL bReenter)
 {
 	PLAYERSTATS		nullStats;
@@ -2584,7 +2596,7 @@
 	if(!bReenter)
 	{
 		initPlayerColours();			 // force a colour clearout.
-
+		initTeams();					// reset teams to defaults.
 		for(i=0;i<MAX_PLAYERS;i++)
 		{
 //			game.skirmishPlayers[i] = 1; // clear out skirmish setting