Fixed player problems with campaign and command line starting.

doc/ChangeLog.html

@@ -815,6 +815,8 @@
     <LI>Fixed bug #557954: Opponent's action markers are visible.
     <LI>The tips are only shown in the single player game.
     <LI>Multiplayer menus should now work. (from Ari)
+    <LI>Final:
+    <LI>Fixed bug: Player are wrong assigned in campaign.
     <LI>+++
     </UL>
 

src/game/campaign.cpp

@@ -51,8 +51,8 @@ global char DefaultObjective[] = "-Destroy your enemies";
 
 global int GameResult;			/// Outcome of the game
 global char CurrentMapPath[1024];	/// Path of the current map
-global int RestartScenario=0;		/// Restart the scenario
-global int QuitToMenu=0;		/// Quit to menu
+global int RestartScenario;		/// Restart the scenario
+global int QuitToMenu;			/// Quit to menu
 global Campaign* Campaigns;		/// Campaigns
 global int NumCampaigns;		/// Number of campaigns
 

src/stratagus/player.cpp

@@ -284,6 +284,7 @@ global void CreatePlayer(int type)
     //  Allocate memory for the "list" of this player's units.
     //  FIXME: brutal way, as we won't need UnitMax for this player...
     //	FIXME: ARI: is this needed for 'PlayerNobody' ??
+    //	FIXME:	A: Johns: currently we need no init for the nobody player.
     if( !(player->Units=(Unit**)calloc(UnitMax,sizeof(Unit*))) ) {
 	DebugLevel0("Not enough memory to create player %d.\n",NumPlayers);
 	return;

src/stratagus/stratagus.cpp

@@ -868,12 +868,13 @@ global void MenuLoop(char* filename, WorldMap* map)
 	    EnableRedraw=RedrawMenu;
 	    ProcessMenu(MENU_PRG_START, 1);
 	    EnableRedraw=RedrawEverything;
-	    if( NetworkFildes!=-1 && NetPlayers<2 ) {
-		ExitNetwork1();
-	    }
 	    DebugLevel0Fn("Menu start: NetPlayers %d\n", NetPlayers);
 	    filename = CurrentMapPath;
 	}
+	if( NetworkFildes!=-1 && NetPlayers<2 ) {
+	    ExitNetwork1();
+	}
+
 	//
 	//	Create the game.
 	//