Use the host's SP color as the default color when hosting games. (che…

…rry picked from commit 09ea0be)

Conflicts:

	lib/netplay/netplay.c

lib/netplay/netplay.c

@@ -49,6 +49,7 @@
 #include "src/multijoin.h"
 #include "src/multiint.h"
 #include "src/multiplay.h"
+#include "src/warzoneconfig.h"
 
 #ifdef WZ_OS_LINUX
 #include <execinfo.h>  // Nonfatal runtime backtraces.
@@ -297,6 +298,11 @@ void NET_InitPlayers()
 		NETinitQueue(NETnetQueue(i));
 	}
 	NETinitQueue(NETbroadcastQueue());
+	// Now switch player color of the host to what they normally use for SP games
+	if ( getPlayerColour(NET_HOST_ONLY) != war_GetSPcolor())
+	{
+		changeColour(NET_HOST_ONLY, war_GetSPcolor());
+	}
 	NetPlay.hostPlayer = NET_HOST_ONLY;	// right now, host starts always at index zero
 	NetPlay.playercount = 0;
 	NetPlay.pMapFileHandle = NULL;

src/multiint.c

@@ -1645,7 +1645,7 @@ static BOOL changePosition(UBYTE player, UBYTE position)
 	return false;
 }
 
-static BOOL changeColour(UBYTE player, UBYTE col)
+BOOL changeColour(UBYTE player, UBYTE col)
 {
 	int i;
 
@@ -3241,11 +3241,16 @@ BOOL startMultiOptions(BOOL bReenter)
 	{
 		teamChooserUp = -1;
 		allowChangePosition = true;
-		for(i=0;i<MAX_PLAYERS;i++)
+		for(i=0; i < MAX_PLAYERS; i++)
 		{
 			game.skDiff[i] = (DIFF_SLIDER_STOPS / 2);	// reset AI (turn it on again)
 			setPlayerColour(i,i);						//reset all colors as well
 		}
+		// Now switch player color of the host to what they normally use
+		if (getPlayerColour(NET_HOST_ONLY) != war_GetSPcolor())
+		{
+			changeColour(NET_HOST_ONLY, war_GetSPcolor());
+		}
 
 		if(!NetPlay.bComms)			// force skirmish if no comms.
 		{

src/multiint.h

@@ -49,7 +49,7 @@ extern	BOOL	startMultiOptions		(BOOL bReenter);
 extern	void	frontendMultiMessages	(void);
 
 extern BOOL addMultiBut(W_SCREEN *screen, UDWORD formid, UDWORD id, UDWORD x, UDWORD y, UDWORD width, UDWORD height, const char* tipres, UDWORD norm, UDWORD down, UDWORD hi);
-
+extern BOOL changeColour(UBYTE player, UBYTE col);
 extern	char	sPlayer[128];
 
 void	kickPlayer(uint32_t player_id, const char *reason, LOBBY_ERROR_TYPES type);