- Multiplayer Improvements:

o Disabled a few ingame options, that does not work correctly with multiplayer. The user cannot enable those options.
-> TOPTION_ALLOW_REAL_TIME_SNEAK
-> TOPTION_ALLOW_CROWS
-> TOPTION_ALLOW_SOLDIER_TOOLTIPS
-> TOPTION_USE_AUTO_SAVE
-> TOPTION_TOGGLE_TURN_MODE
-> TOPTION_USE_NCTH
o When the server enters the strategy map, the airspace view is shown together with an info message how to switch sectors

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4738 3b4a5df2-a311-0410-b5c6-a8a6f20db521

GameSettings.cpp

@@ -166,24 +166,52 @@ BOOLEAN LoadGameSettings()
 		gGameSettings.fOptions[TOPTION_GL_BURST_CURSOR]                 = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_GL_BURST_CURSOR"                  ,  TRUE  );
 		gGameSettings.fOptions[TOPTION_ALLOW_TAUNTS]					= iniReader.ReadBoolean("JA2 Game Settings","TOPTION_ALLOW_TAUNTS"					   ,  TRUE  ); // changed from drop all - SANDRO
 		gGameSettings.fOptions[TOPTION_GL_HIGH_ANGLE]					= iniReader.ReadBoolean("JA2 Game Settings","TOPTION_GL_HIGH_ANGLE"                    ,  FALSE );
+		
+		if (!is_networked)		
 			gGameSettings.fOptions[TOPTION_ALLOW_REAL_TIME_SNEAK]		= iniReader.ReadBoolean("JA2 Game Settings","TOPTION_ALLOW_REAL_TIME_SNEAK"            ,  FALSE ); // Changed from aim levels restriction - SANDRO
+		else
+			gGameSettings.fOptions[TOPTION_ALLOW_REAL_TIME_SNEAK]	    = FALSE;
+
 		gGameSettings.fOptions[TOPTION_SPACE_SELECTS_NEXT_SQUAD]        = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_SPACE_SELECTS_NEXT_SQUAD"         ,  TRUE  );
 		gGameSettings.fOptions[TOPTION_SHOW_ITEM_SHADOW]                = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_SHOW_ITEM_SHADOW"                 ,  TRUE  );
 		gGameSettings.fOptions[TOPTION_SHOW_WEAPON_RANGE_IN_TILES]      = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_SHOW_WEAPON_RANGE_IN_TILES"       ,  TRUE  );
 		gGameSettings.fOptions[TOPTION_TRACERS_FOR_SINGLE_FIRE]         = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_TRACERS_FOR_SINGLE_FIRE"          ,  FALSE );
 		gGameSettings.fOptions[TOPTION_RAIN_SOUND]                      = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_RAIN_SOUND"                       ,  TRUE  );
+		
+		if (!is_networked)
 			gGameSettings.fOptions[TOPTION_ALLOW_CROWS]                 = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_ALLOW_CROWS"                      ,  TRUE  );
+		else
+			gGameSettings.fOptions[TOPTION_ALLOW_CROWS]					= FALSE;
+
+		if (!is_networked)
 			gGameSettings.fOptions[TOPTION_ALLOW_SOLDIER_TOOLTIPS]      = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_ALLOW_SOLDIER_TOOLTIPS"           ,  TRUE  );
+		else
+			gGameSettings.fOptions[TOPTION_ALLOW_SOLDIER_TOOLTIPS]      = FALSE;
+
+		if (!is_networked)
 			gGameSettings.fOptions[TOPTION_USE_AUTO_SAVE]               = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_USE_AUTO_SAVE"                    ,  FALSE );
+		else
+			gGameSettings.fOptions[TOPTION_USE_AUTO_SAVE]				= FALSE;
+
 		gGameSettings.fOptions[TOPTION_SILENT_SKYRIDER]                 = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_SILENT_SKYRIDER"                  ,  FALSE );
 		//gGameSettings.fOptions[TOPTION_LOW_CPU_USAGE]                   = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_LOW_CPU_USAGE"                    ,  FALSE );
 		gGameSettings.fOptions[TOPTION_ENHANCED_DESC_BOX]               = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_ENHANCED_DESC_BOX"                ,  TRUE );
+		
+		if (!is_networked)
 			gGameSettings.fOptions[TOPTION_TOGGLE_TURN_MODE]            = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_TOGGLE_TURN_MODE"                 ,  FALSE );
+		else
+			gGameSettings.fOptions[TOPTION_TOGGLE_TURN_MODE]			= FALSE;
+
 		gGameSettings.fOptions[TOPTION_STAT_PROGRESS_BARS]              = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_STAT_PROGRESS_BARS"               ,  TRUE ); // HEADROCK HAM 3.6: Progress Bars
 		gGameSettings.fOptions[TOPTION_REPORT_MISS_MARGIN]				= iniReader.ReadBoolean("JA2 Game Settings","TOPTION_REPORT_MISS_MARGIN"			   ,  FALSE ); // HEADROCK HAM 4: Shot offset report
 		gGameSettings.fOptions[TOPTION_ALT_MAP_COLOR]					= iniReader.ReadBoolean("JA2 Game Settings","TOPTION_ALT_MAP_COLOR"					   ,  FALSE ); // HEADROCK HAM 4: Strategic Map Colors
 		gGameSettings.fOptions[TOPTION_ALTERNATE_BULLET_GRAPHICS]       = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_ALTERNATE_BULLET_GRAPHICS"        ,  TRUE );
+		
+		if (!is_networked)
 			gGameSettings.fOptions[TOPTION_USE_NCTH]					= iniReader.ReadBoolean("JA2 Game Settings","TOPTION_USE_NCTH"						   ,  TRUE );
+		else
+			gGameSettings.fOptions[TOPTION_USE_NCTH]					= FALSE;
+
 		gGameSettings.fOptions[TOPTION_SHOW_TACTICAL_FACE_GEAR]		    = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_SHOW_TACTICAL_FACE_GEAR"		   ,  TRUE );
 		gGameSettings.fOptions[TOPTION_SHOW_TACTICAL_FACE_ICONS]	    = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_SHOW_TACTICAL_FACE_ICONS"		   ,  TRUE );
 		gGameSettings.fOptions[TOPTION_CHEAT_MODE_OPTIONS_HEADER]       = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_CHEAT_MODE_OPTIONS_HEADER"        ,  FALSE );
@@ -265,6 +293,8 @@ BOOLEAN LoadGameSettings()
 
 
 BOOLEAN	SaveGameSettings()
+{
+	if (!is_networked)
 	{
 		//Record the current settings into the game settins structure
 		gGameSettings.ubSoundEffectsVolume = (UINT8)GetSoundEffectsVolume( );
@@ -396,9 +426,9 @@ BOOLEAN	SaveGameSettings()
 				SGP_TRYCATCH_RETHROW(file.write(settings.str().c_str(), settings.str().length()),L"");
 			}
 		}
+	}
 
 	return( TRUE );
-
 }
 
 

MainMenuScreen.cpp

@@ -401,6 +401,9 @@ void ExitMainMenu( )
 // differently for single and multiplayer
 void InitDependingGameStyleOptions()
 {
+	// WANNE: Initialize again, because if differs from SP to MP game!
+	LoadGameSettings();
+
 	FreeGameExternalOptions();
 
 	// Load APBPConstants.ini

Multiplayer/client.cpp

@@ -134,6 +134,7 @@
 #include "Debug Control.h"
 #include "MPConnectScreen.h"
 #include "IniReader.h"
+#include "Map Screen Interface Border.h"
 
 extern CHAR16 gzFileTransferDirectory[100];
 
@@ -2497,6 +2498,10 @@ void recieveSETTINGS (RPCParameters *rpcParameters) //recive settings from serve
 			// OJW - 20091024 - extract random table
 			if (!is_server)
 				memcpy(guiPreRandomNums,cl_lan->random_table,sizeof(UINT32)*MAX_PREGENERATED_NUMS);
+
+			// WANNE: Turn on airspace mode (to switch maps) for the server!
+			if (is_server)			
+				TurnOnAirSpaceMode();			
 		}
 	}
 	else 

Strategic/Map Screen Interface Border.cpp

@@ -31,7 +31,7 @@
 	#include "Quests.h"	
 #endif
 
-
+#include "connect.h"
 
 
 
@@ -1470,6 +1470,14 @@ void TurnOnAirSpaceMode( void )
 			JumpToLevel( 0 );
 		}
 
+		// WANNE: Output info text on the airspace for changing maps
+		if (is_server )
+		{			
+			STR16 pwString = MPServerMessage[ 13 ];
+
+			MapScreenMessage( FONT_MCOLOR_LTYELLOW, MSG_MAP_UI_POSITION_MIDDLE, pwString );
+		}
+
 		// dirty regions
 		fMapPanelDirty = TRUE;
 		fTeamPanelDirty = TRUE;
@@ -1817,7 +1825,11 @@ void InitMapScreenFlags( void )
 	fShowTeamFlag = TRUE;
 	fShowMilitia = FALSE;
 
+	if (is_networked && is_server)
+		fShowAircraftFlag = TRUE;
+	else
 		fShowAircraftFlag = FALSE;
+
 	fShowItemsFlag = FALSE;
 
 	// HEADROCK HAM 4: Militia Restrictions

Utils/_ChineseText.cpp

@@ -5948,6 +5948,7 @@ STR16 MPServerMessage[] =
 	L"已发送文件 '%S' - 100/100",//L"Sent file '%S' - 100/100",
 	L"文件已发送到 '%S' ",//	L"Finished sending files to '%S'.",
 	L"开始发送文件到 '%S'.",//	L"Started sending files to '%S'.",
+	L"Use the Airspace view to select a map you wish to play. If you want to change the map you have to do this before clicking the 'Start Game' button.",	// TODO.Translate
 };
 
 STR16 MPClientMessage[] =

Utils/_DutchText.cpp

@@ -5948,6 +5948,7 @@ STR16 MPServerMessage[] =
 	L"Sent file '%S' - 100/100",
 	L"Finished sending files to '%S'.",
 	L"Started sending files to '%S'.",
+	L"Use the Airspace view to select a map you wish to play. If you want to change the map you have to do this before clicking the 'Start Game' button.",	// TODO.Translate
 };
 
 STR16 MPClientMessage[] =

Utils/_EnglishText.cpp

@@ -5950,6 +5950,7 @@ STR16 MPServerMessage[] =
 	L"Sent file '%S' - 100/100",
 	L"Finished sending files to '%S'.",
 	L"Started sending files to '%S'.",
+	L"Use the Airspace view to select a map you wish to play. If you want to change the map you have to do this before clicking the 'Start Game' button.",
 };
 
 STR16 MPClientMessage[] =

Utils/_FrenchText.cpp

@@ -5952,6 +5952,7 @@ STR16 MPServerMessage[] =
 	L"Fichier envoyé '%S' - 100/100",
 	L"Envoie de fichier fini pour '%S'.",
 	L"Départ d'envoie de fichier pour '%S'.",
+	L"Use the Airspace view to select a map you wish to play. If you want to change the map you have to do this before clicking the 'Start Game' button.",	// TODO.Translate
 };
 
 STR16 MPClientMessage[] =

Utils/_GermanText.cpp

@@ -5782,6 +5782,7 @@ STR16 MPServerMessage[] =
 	L"Datei '%S' gesendet - 100/100",
 	L"Alle Dateien wurden an '%S' gesendet.",
 	L"Starte mit dem versenden der Dateien an '%S'.",
+	L"Verwenden Sie die Anzeige für die Absprungzone wenn Sie den Startsektor ändern möchten. Änderungen sind nur möglich, bevor Sie auf 'Starte Spiel' geklickt haben.",
 };
 
 STR16 MPClientMessage[] =

Utils/_ItalianText.cpp

@@ -5948,6 +5948,7 @@ STR16 MPServerMessage[] =
 	L"Sent file '%S' - 100/100",
 	L"Finished sending files to '%S'.",
 	L"Started sending files to '%S'.",
+	L"Use the Airspace view to select a map you wish to play. If you want to change the map you have to do this before clicking the 'Start Game' button.",	// TODO.Translate
 };
 
 STR16 MPClientMessage[] =

Utils/_PolishText.cpp

@@ -5951,6 +5951,7 @@ STR16 MPServerMessage[] =
 	L"Wys³ano '%S' pliku - 100/100",
 	L"Zakoñczono wysy³anie plików do '%S'.",
 	L"Rozpoczêto wysy³anie plików do '%S'.",
+	L"Use the Airspace view to select a map you wish to play. If you want to change the map you have to do this before clicking the 'Start Game' button.",	// TODO.Translate
 };
 
 STR16 MPClientMessage[] =

Utils/_RussianText.cpp

@@ -5933,6 +5933,7 @@ STR16 MPServerMessage[] =
 	L"Отправка файла '%S' - 100/100",	//Sent file '%S' - 100/100
 	L"Завершена отправка файлов для '%S'.",	//Finished sending files to '%S'.
 	L"Начата отправка файлов для '%S'.",	//Started sending files to '%S'.
+	L"Use the Airspace view to select a map you wish to play. If you want to change the map you have to do this before clicking the 'Start Game' button.",	// TODO.Translate
 };
 
 STR16 MPClientMessage[] =

Utils/_TaiwaneseText.cpp

@@ -5955,6 +5955,7 @@ STR16 MPServerMessage[] =
 	L"Sent file '%S' - 100/100",
 	L"Finished sending files to '%S'.",
 	L"Started sending files to '%S'.",
+	L"Use the Airspace view to select a map you wish to play. If you want to change the map you have to do this before clicking the 'Start Game' button.",	// TODO.Translate
 };
 
 STR16 MPClientMessage[] =