- removed inventory choice from "start new game" screen in multiplayer mode -> now the inventory choice is defined in "ja2_mp.ini"

- added new headline text in the "start new game" screen for multiplayer mode

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

GameInitOptionsScreen.cpp

@@ -406,7 +406,7 @@ BOOLEAN		EnterGIOScreen()
 	if(is_networked)
 	{
 	MPgiGIOCancelBtnImage = UseLoadedButtonImage( giGIODoneBtnImage, -1,1,-1,3,-1 );
-	MPguiGIOCancelButton = CreateIconAndTextButton( giGIOCancelBtnImage, gzGIOScreenText[30], OPT_BUTTON_FONT,
+	MPguiGIOCancelButton = CreateIconAndTextButton( giGIOCancelBtnImage, gzGIOScreenText[GIO_LOAD_MP_GAME], OPT_BUTTON_FONT,
 													OPT_BUTTON_ON_COLOR, DEFAULT_SHADOW,
 													OPT_BUTTON_OFF_COLOR, DEFAULT_SHADOW,
 													TEXT_CJUSTIFIED,
@@ -496,25 +496,28 @@ BOOLEAN		EnterGIOScreen()
 	}
 
 	// CHRISL: New inventory options
-	if(IsNIVModeValid() == TRUE){
+	if (!is_networked)
-		usPosY = GIO_INV_SETTING_Y - GIO_OFFSET_TO_TOGGLE_BOX_Y;
+	{
-		for( cnt=0; cnt<NUM_INV_OPTIONS; cnt++)
+		if(IsNIVModeValid() == TRUE){
-		{
+			usPosY = GIO_INV_SETTING_Y - GIO_OFFSET_TO_TOGGLE_BOX_Y;
-			guiINVOptionToggles[ cnt ] = CreateCheckBoxButton(	GIO_INV_SETTING_X+GIO_OFFSET_TO_TOGGLE_BOX, usPosY, 
+			for( cnt=0; cnt<NUM_INV_OPTIONS; cnt++)
-																			"INTERFACE\\OptionsCheck.sti", MSYS_PRIORITY_HIGH+10, 
+			{
-																			BtnINVOptionTogglesCallback );
+				guiINVOptionToggles[ cnt ] = CreateCheckBoxButton(	GIO_INV_SETTING_X+GIO_OFFSET_TO_TOGGLE_BOX, usPosY, 
-			MSYS_SetBtnUserData( guiINVOptionToggles[ cnt ], 0, cnt );
+																				"INTERFACE\\OptionsCheck.sti", MSYS_PRIORITY_HIGH+10, 
+																				BtnINVOptionTogglesCallback );
+				MSYS_SetBtnUserData( guiINVOptionToggles[ cnt ], 0, cnt );
 
-			usPosY += GIO_GAP_BN_SETTINGS-5;
+				usPosY += GIO_GAP_BN_SETTINGS-5;
-		}
+			}
-		switch( gGameOptions.ubInventorySystem )
+			switch( gGameOptions.ubInventorySystem )
-		{
+			{
-			case INVENTORY_OLD:
+				case INVENTORY_OLD:
-				ButtonList[ guiINVOptionToggles[ GIO_INV_OLD ] ]->uiFlags |= BUTTON_CLICKED_ON;
+					ButtonList[ guiINVOptionToggles[ GIO_INV_OLD ] ]->uiFlags |= BUTTON_CLICKED_ON;
-				break;
+					break;
-			case INVENTORY_NEW:
+				case INVENTORY_NEW:
-				ButtonList[ guiINVOptionToggles[ GIO_INV_NEW ] ]->uiFlags |= BUTTON_CLICKED_ON;
+					ButtonList[ guiINVOptionToggles[ GIO_INV_NEW ] ]->uiFlags |= BUTTON_CLICKED_ON;
-				break;
+					break;
+			}
 		}
 	}
 
@@ -641,9 +644,12 @@ BOOLEAN		ExitGIOScreen()
 		RemoveButton( guiBROptionToggles[ cnt ] );
 
 // CHRISL
-	if(IsNIVModeValid() == TRUE){
+	if (!is_networked)
-		for( cnt=0; cnt<NUM_INV_OPTIONS; cnt++)
+	{
-			RemoveButton( guiINVOptionToggles[ cnt ] );
+		if(IsNIVModeValid() == TRUE){
+			for( cnt=0; cnt<NUM_INV_OPTIONS; cnt++)
+				RemoveButton( guiINVOptionToggles[ cnt ] );
+		}
 	}
 
 	// JA2Gold: remove iron man buttons
@@ -742,7 +748,15 @@ BOOLEAN		RenderGIOScreen()
 	ShadowVideoSurfaceRect( FRAME_BUFFER, iScreenWidthOffset, iScreenHeightOffset, iScreenWidthOffset + 640, iScreenHeightOffset + 480 );
 
 	//Display the title
-	DrawTextToScreen( gzGIOScreenText[ GIO_INITIAL_GAME_SETTINGS ], GIO_MAIN_TITLE_X, GIO_MAIN_TITLE_Y, GIO_MAIN_TITLE_WIDTH, GIO_TITLE_FONT, GIO_TITLE_COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED );
+	if (!is_networked)
+	{
+		DrawTextToScreen( gzGIOScreenText[ GIO_INITIAL_GAME_SETTINGS ], GIO_MAIN_TITLE_X, GIO_MAIN_TITLE_Y, GIO_MAIN_TITLE_WIDTH, GIO_TITLE_FONT, GIO_TITLE_COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED );
+	}
+	else
+	{
+		DrawTextToScreen( gzGIOScreenText[ GIO_INITIAL_GAME_SETTINGS_MP ], GIO_MAIN_TITLE_X, GIO_MAIN_TITLE_Y, GIO_MAIN_TITLE_WIDTH, GIO_TITLE_FONT, GIO_TITLE_COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED );
+	}
+
 
 	//Display the Dif Settings Title Text
 	//DrawTextToScreen( gzGIOScreenText[ GIO_DIF_LEVEL_TEXT ], GIO_DIF_SETTINGS_X, (UINT16)(GIO_DIF_SETTINGS_Y-GIO_GAP_BN_SETTINGS), GIO_DIF_SETTINGS_WIDTH, GIO_TOGGLE_TEXT_FONT, GIO_TOGGLE_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );	
@@ -825,14 +839,18 @@ BOOLEAN		RenderGIOScreen()
 	DisplayWrappedString( (UINT16)(GIO_BR_SETTING_X+GIO_OFFSET_TO_TEXT), usPosY, GIO_DIF_SETTINGS_WIDTH, 2, GIO_TOGGLE_TEXT_FONT, GIO_TOGGLE_TEXT_COLOR, gzGIOScreenText[ GIO_BR_AWESOME_TEXT ], FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );
 
 // CHRISL
-	if(IsNIVModeValid() == TRUE){
+	if (!is_networked)
-		DisplayWrappedString( GIO_INV_SETTING_X, (UINT16)(GIO_INV_SETTING_Y-GIO_GAP_BN_SETTINGS), GIO_DIF_SETTINGS_WIDTH + 20, 2, GIO_TOGGLE_TEXT_FONT, GIO_TOGGLE_TEXT_COLOR, gzGIOScreenText[ GIO_INV_TEXT ], FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );
+	{
-		usPosY = GIO_INV_SETTING_Y+2;
+		if(IsNIVModeValid() == TRUE)
+		{
+			DisplayWrappedString( GIO_INV_SETTING_X, (UINT16)(GIO_INV_SETTING_Y-GIO_GAP_BN_SETTINGS), GIO_DIF_SETTINGS_WIDTH + 20, 2, GIO_TOGGLE_TEXT_FONT, GIO_TOGGLE_TEXT_COLOR, gzGIOScreenText[ GIO_INV_TEXT ], FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );
+			usPosY = GIO_INV_SETTING_Y+2;
 
-		DisplayWrappedString( (UINT16)(GIO_INV_SETTING_X+GIO_OFFSET_TO_TEXT), usPosY, GIO_DIF_SETTINGS_WIDTH, 2, GIO_TOGGLE_TEXT_FONT, GIO_TOGGLE_TEXT_COLOR, gzGIOScreenText[ GIO_INV_OLD_TEXT ], FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );
+			DisplayWrappedString( (UINT16)(GIO_INV_SETTING_X+GIO_OFFSET_TO_TEXT), usPosY, GIO_DIF_SETTINGS_WIDTH, 2, GIO_TOGGLE_TEXT_FONT, GIO_TOGGLE_TEXT_COLOR, gzGIOScreenText[ GIO_INV_OLD_TEXT ], FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );
-		usPosY += GIO_GAP_BN_SETTINGS-5;
+			usPosY += GIO_GAP_BN_SETTINGS-5;
 
-		DisplayWrappedString( (UINT16)(GIO_INV_SETTING_X+GIO_OFFSET_TO_TEXT), usPosY, GIO_DIF_SETTINGS_WIDTH, 2, GIO_TOGGLE_TEXT_FONT, GIO_TOGGLE_TEXT_COLOR, gzGIOScreenText[ GIO_INV_NEW_TEXT ], FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );
+			DisplayWrappedString( (UINT16)(GIO_INV_SETTING_X+GIO_OFFSET_TO_TEXT), usPosY, GIO_DIF_SETTINGS_WIDTH, 2, GIO_TOGGLE_TEXT_FONT, GIO_TOGGLE_TEXT_COLOR, gzGIOScreenText[ GIO_INV_NEW_TEXT ], FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );
+		}
 	}
 
 // JA2Gold: Display the iron man Settings Title Text

Multiplayer/client.cpp

@@ -240,6 +240,7 @@ char ckbag[100];
  char SERVER_IP[30] ;
  char SERVER_PORT[30];
 
+ int INVENTORY_MODE;
  int REPORT_NAME;
  int WEAPON_READIED_BONUS;
  int ALLOW_CUSTOM_NIV;
@@ -1932,41 +1933,36 @@ void recieveSETTINGS (RPCParameters *rpcParameters) //recive settings from serve
 			ALLOW_CUSTOM_NIV=cl_lan->ALLOW_CUSTOM_NIV;
 			DISABLE_SPEC_MODE=cl_lan->DISABLE_SPEC_MODE;
 			
-			
+			// We have to take the selected inventory mode from the server
 			if(ALLOW_CUSTOM_NIV==0)
 			{	
-				// WANNE - MP: If the clients has selected another inventory than the server had choosen.
+				gGameOptions.ubInventorySystem=cl_lan->sofNewInv;
-				if (gGameOptions.ubInventorySystem != cl_lan->sofNewInv)
-				{
-					gGameOptions.ubInventorySystem=cl_lan->sofNewInv;
-
-					// WANNE - MP: We have to re-initialize the correct interface
-					if((UsingNewInventorySystem() == true) && IsNIVModeValid(true))
-					{
-						InitNewInventorySystem();
-						InitializeSMPanelCoordsNew();
-						InitializeInvPanelCoordsNew();
-					}
-					else
-					{
-						gGameOptions.ubInventorySystem = 0;
-						InitOldInventorySystem();
-						InitializeSMPanelCoordsOld();
-						InitializeInvPanelCoordsOld();
-					}
-
-					// WANNE - MP: We also have to reinitialize the merc profiles because
-					// they depend on the inventory!
-					LoadMercProfiles();
-				}
 			}
 
-			
+			// WANNE - MP: We have to re-initialize the correct interface
+			if((UsingNewInventorySystem() == true) && IsNIVModeValid(true))
+			{
+				InitNewInventorySystem();
+				InitializeSMPanelCoordsNew();
+				InitializeInvPanelCoordsNew();
+			}
+			else
+			{
+				gGameOptions.ubInventorySystem = INVENTORY_OLD;
+				InitOldInventorySystem();
+				InitializeSMPanelCoordsOld();
+				InitializeInvPanelCoordsOld();
+			}
+
+			// WANNE - MP: We also have to reinitialize the merc profiles because
+			// they depend on the inventory!
+			LoadMercProfiles();
+				
 			ScreenMsg( FONT_LTGREEN, MSG_CHAT, MPClientMessage[26],cl_lan->client_num,szDefault,cl_lan->cl_edge,cl_lan->team );
 //		if(PLAYER_BSIDE==0)ScreenMsg(FONT_LTGREEN,MSG_CHAT,MPClientMessage[27],cl_lan->cl_ops[0],cl_lan->cl_ops[1],cl_lan->cl_ops[2],cl_lan->cl_ops[3]);
 		//ScreenMsg(FONT_LTGREEN,MSG_CHAT,MPClientMessage[27],cl_lan->team);
 	
-				strcpy(client_names[cl_lan->client_num-1],szDefault);				
+			strcpy(client_names[cl_lan->client_num-1],szDefault);				
 
 		}
 		else 
@@ -2805,8 +2801,8 @@ void connect_client ( void )
 		
 			
 			GetPrivateProfileString( "Ja2_mp Settings","CLIENT_NAME", "", clname, MAX_PATH, "..\\Ja2_mp.ini" );
-
+			
-		
+			gGameOptions.ubInventorySystem = GetPrivateProfileInt( "Ja2_mp Settings","INVENTORY_MODE", INVENTORY_OLD, "..\\Ja2_mp.ini" );
 			
 	
 

Utils/Text.h

@@ -1419,6 +1419,8 @@ enum
 	GIO_INV_TEXT,
 	GIO_INV_OLD_TEXT,
 	GIO_INV_NEW_TEXT,
+	GIO_LOAD_MP_GAME,
+	GIO_INITIAL_GAME_SETTINGS_MP,
 };
 extern STR16	gzGIOScreenText[];
 

Utils/_DutchText.cpp

@@ -3616,11 +3616,8 @@ STR16	gzGIOScreenText[] =
 	L"Inventory System",
 	L"Old",
 	L"New",
-
-	L"Timed Turns",//hayden
-	L"Not Timed",
-	L"Timed Player Turns",
 	L"Load MP Game",
+	L"INITIAL GAME SETTINGS (Only the server settings take effect)",
 };
 
 STR16 pDeliveryLocationStrings[] =

Utils/_EnglishText.cpp

@@ -3611,7 +3611,6 @@ STR16	gzGIOScreenText[] =
 	L"Save Anytime",
 	L"Iron Man",
 	L"Disabled for Demo",
-
 	L"Bobby Ray's Selection",
 	L"Normal",
 	L"Great",
@@ -3620,12 +3619,8 @@ STR16	gzGIOScreenText[] =
 	L"Inventory System",
 	L"Old",
 	L"New",
-
-	L"Timed Turns",//hayden
-	L"Not Timed",
-	L"Timed Player Turns",
 	L"Load MP Game",
-
+	L"INITIAL GAME SETTINGS (Only the server settings take effect)",
 };
 
 STR16 pDeliveryLocationStrings[] =

Utils/_FrenchText.cpp

@@ -3606,11 +3606,8 @@ STR16	gzGIOScreenText[] =
 	L"Inventory System",
 	L"Old",
 	L"New",
-
-	L"Timed Turns",//hayden
-	L"Not Timed",
-	L"Timed Player Turns",
 	L"Load MP Game",
+	L"INITIAL GAME SETTINGS (Only the server settings take effect)",
 };
 
 STR16 pDeliveryLocationStrings[] =

Utils/_GermanText.cpp

@@ -3421,11 +3421,8 @@ STR16 gzGIOScreenText[] =
 	L"Inventar System",
 	L"Alt",
 	L"Neu",
-
-	L"Timed Turns",//hayden
-	L"Not Timed",
-	L"Timed Player Turns",
 	L"Lade MP Spiel",
+	L"GRUNDEINSTELLUNGEN (Nur Servereinstellungen werden verwendet)",
 };
 
 STR16 pDeliveryLocationStrings[] =

Utils/_ItalianText.cpp

@@ -3597,11 +3597,8 @@ STR16	gzGIOScreenText[] =
 	L"Inventory System",
 	L"Old",
 	L"New",
-
-	L"Timed Turns",//hayden
-	L"Not Timed",
-	L"Timed Player Turns",
 	L"Load MP Game",
+	L"INITIAL GAME SETTINGS (Only the server settings take effect)",
 };
 
 STR16 pDeliveryLocationStrings[] =

Utils/_PolishText.cpp

@@ -3597,11 +3597,8 @@ STR16	gzGIOScreenText[] =
 	L"Inventory System",
 	L"Old",
 	L"New",
-
-	L"Timed Turns",//hayden
-	L"Not Timed",
-	L"Timed Player Turns",
 	L"Load MP Game",
+	L"INITIAL GAME SETTINGS (Only the server settings take effect)",
 };
 
 STR16 pDeliveryLocationStrings[] =

Utils/_RussianText.cpp

@@ -3613,11 +3613,8 @@ STR16	gzGIOScreenText[] =
 	L"Ðåæèì èíâåíòàðÿ",
 	L"Êëàññè÷åñêèé",
 	L"Íîâûé âàðèàíò",
-
-	L"Timed Turns",//hayden
-	L"Not Timed",
-	L"Timed Player Turns",
 	L"Çàãðóçèòü",
+	L"ÓÑÒÀÍÎÂÊÀ ÍÀ×ÀËÀ ÈÃÐÛ (Only the server settings take effect)",
 };
 
 STR16 pDeliveryLocationStrings[] =

Utils/_TaiwaneseText.cpp

@@ -3619,11 +3619,8 @@ STR16	gzGIOScreenText[] =
 	L"Inventory System",
 	L"Old",
 	L"New",
-
-	L"Timed Turns",//hayden
-	L"Not Timed",
-	L"Timed Player Turns",
 	L"Load MP Game",
+	L"INITIAL GAME SETTINGS (Only the server settings take effect)",
 };
 
 STR16 pDeliveryLocationStrings[] =