- Fix: individual militia are not properly disbanded if player runs out of funds

- Fix: wrong website names used
- Removed confusing links on militia overview website

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

Laptop/MilitiaWebsite.cpp

@@ -85,32 +85,8 @@ extern UINT32	guiMercCompareLogoImage;
 
 extern UINT32	gusMostImportantPage;
 
-//link to the various pages
-MOUSE_REGION	gLinkRegion_MilitiaWebsite[NUM_LINKS];
-
 UINT32 gARFacesLib = 0;
 
-void SelectLinkRegionCallBack_MilitiaWebsite( MOUSE_REGION * pRegion, INT32 iReason )
-{
-	if ( iReason & MSYS_CALLBACK_REASON_INIT )
-	{
-	}
-	else if ( iReason & MSYS_CALLBACK_REASON_LBUTTON_UP )
-	{
-		UINT32 uiLink = MSYS_GetRegionUserData( pRegion, 0 );
-
-		if ( uiLink == 0 )
-			guiCurrentLaptopMode = LAPTOP_MODE_MILITIAROSTER_MAIN;
-		else if ( uiLink == 1 )
-			guiCurrentLaptopMode = LAPTOP_MODE_MILITIAROSTER_ABOUT;
-		else if ( uiLink == 2 )
-			guiCurrentLaptopMode = LAPTOP_MODE_BROKEN_LINK;
-	}
-	else if ( iReason & MSYS_CALLBACK_REASON_RBUTTON_UP )
-	{
-	}
-}
-
 void InitDefaults_MilitiaWebsite( )
 {
 	VOBJECT_DESC	VObjectDesc;
@@ -137,18 +113,6 @@ void InitDefaults_MilitiaWebsite( )
 	VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
 	FilenameForBPP( "Interface\\SmFaces.sti", VObjectDesc.ImageFile );
 	CHECKV( AddVideoObject( &VObjectDesc, &gARFacesLib ) );
-
-	UINT16 usPosX = CAMPAIGN_HISTORY_LINK_START_X;
-	UINT16 usPosY = CAMPAIGN_HISTORY_LINK_START_Y;
-	for ( int i = 0; i<NUM_LINKS; ++i )
-	{
-		MSYS_DefineRegion( &gLinkRegion_MilitiaWebsite[i], usPosX, usPosY, (UINT16)(usPosX + CAMPAIGN_HISTORY_LINK_TEXT_WIDTH), usPosY + CAMPAIGN_HISTORY_LINK_STEP_Y, MSYS_PRIORITY_HIGH,
-						   CURSOR_WWW, MSYS_NO_CALLBACK, SelectLinkRegionCallBack_MilitiaWebsite );
-		MSYS_AddRegion( &gLinkRegion_MilitiaWebsite[i] );
-		MSYS_SetRegionUserData( &gLinkRegion_MilitiaWebsite[i], 0, i );
-
-		usPosY += CAMPAIGN_HISTORY_LINK_STEP_Y;
-	}
 }
 
 void DisplayDefaults_MilitiaWebsite( )
@@ -166,24 +130,14 @@ void DisplayDefaults_MilitiaWebsite( )
 
 	//Display the title slogan
 	swprintf( sText, szMilitiaWebSite[TEXT_MILITIAWEBSITE_WEBSITENAME] );
-	DrawTextToScreen( sText, CAMPAIGN_HISTORY_BIG_TITLE_X, CAMPAIGN_HISTORY_BIG_TITLE_Y, LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X, CAMPHIS_FONT_BIG, MERCOMP_FONT_COLOR, FONT_MCOLOR_BLACK, FALSE, 0 );
+	DrawTextToScreen( sText, usPosX, CAMPAIGN_HISTORY_BIG_TITLE_Y, LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X, CAMPHIS_FONT_BIG, MERCOMP_FONT_COLOR, FONT_MCOLOR_BLACK, FALSE, 0 );
 
 	//Display the subtitle slogan
 	swprintf( sText, szMilitiaWebSite[TEXT_MILITIAWEBSITE_SLOGAN] );
-	DrawTextToScreen( sText, CAMPAIGN_HISTORY_SUBTITLE_X, CAMPAIGN_HISTORY_SUBTITLE_Y, 0, CAMPHIS_FONT_BIG, MERCOMP_FONT_COLOR, FONT_MCOLOR_BLACK, FALSE, 0 );
+	DrawTextToScreen( sText, usPosX, CAMPAIGN_HISTORY_SUBTITLE_Y, 0, CAMPHIS_FONT_BIG, MERCOMP_FONT_COLOR, FONT_MCOLOR_BLACK, FALSE, 0 );
 
 	usPosX = CAMPAIGN_HISTORY_LINK_START_X;
-	usPosY = CAMPAIGN_HISTORY_LINK_START_Y;
+	usPosY = CAMPAIGN_HISTORY_SUBTITLE_Y + CAMPAIGN_HISTORY_LINK_STEP_Y;
-	for ( int i = 0; i<NUM_LINKS; ++i )
-	{
-		swprintf( sText, szMilitiaWebSite[TEXT_MILITIAWEBSITE_SUBSITE1 + i] );
-		DisplayWrappedString( usPosX, usPosY, CAMPAIGN_HISTORY_LINK_TEXT_WIDTH, 2, CAMPHIS_FONT_MED, MERCOMP_FONT_COLOR, sText, FONT_MCOLOR_BLACK, FALSE, 0 );
-
-		usPosY += CAMPAIGN_HISTORY_LINK_STEP_Y;
-
-		//Display the red bar under the link at the bottom.	and the text
-		DisplaySmallColouredLineWithShadow( usPosX, usPosY - 2, LAPTOP_SCREEN_UL_X + CAMPAIGN_HISTORY_LINK_TEXT_WIDTH, usPosY - 2, FROMRGB( 255, 127, 0 ) );
-	}
 
 	// closing line that separates header from individual page
 	DisplaySmallColouredLineWithShadow( usPosX, usPosY - 2, LAPTOP_SCREEN_LR_X, usPosY - 2, FROMRGB( 255, 127, 0 ) );
@@ -201,9 +155,6 @@ void RemoveDefaults_MilitiaWebsite( )
 	DeleteVideoObjectFromIndex( guiInsuranceBigRedLineImage );
 	DeleteVideoObjectFromIndex( guiMercCompareBulletImage );
 	DeleteVideoObjectFromIndex( guiMercCompareLogoImage );
-
-	for ( int i = 0; i<NUM_LINKS; ++i )
-		MSYS_RemoveRegion( &gLinkRegion_MilitiaWebsite[i] );
 }
 
 ////////////////////////// MAIN PAGE ////////////////////////////////

Laptop/laptop.cpp

@@ -1503,7 +1503,6 @@ void RenderLaptop()
 			break;
 
 		case LAPTOP_MODE_MILITIAROSTER_MAIN:
-		case LAPTOP_MODE_MILITIAROSTER_ABOUT:
 			RenderMilitiaWebsiteMain( );
 			break;
 	}
@@ -1968,7 +1967,6 @@ void EnterNewLaptopMode()
 			break;
 
 		case LAPTOP_MODE_MILITIAROSTER_MAIN:
-		case LAPTOP_MODE_MILITIAROSTER_ABOUT:
 			EnterMilitiaWebsiteMain( );
 			break;
 	}
@@ -2248,7 +2246,6 @@ void HandleLapTopHandles()
 			break;
 
 		case LAPTOP_MODE_MILITIAROSTER_MAIN:
-		case LAPTOP_MODE_MILITIAROSTER_ABOUT:
 			HandleMilitiaWebsiteMain( );
 			break;
 	}
@@ -2836,7 +2833,6 @@ UINT32 ExitLaptopMode(UINT32 uiMode)
 			break;
 
 		case LAPTOP_MODE_MILITIAROSTER_MAIN:
-		case LAPTOP_MODE_MILITIAROSTER_ABOUT:
 			ExitMilitiaWebsiteMain();
 			break;
 	}

Laptop/laptop.h

@@ -164,7 +164,6 @@ enum
 
 	// Flugente: militia roster
 	LAPTOP_MODE_MILITIAROSTER_MAIN,
-	LAPTOP_MODE_MILITIAROSTER_ABOUT,
 	
 	LAPTOP_MODE_BOBBYR_SHIPMENTS,
 	

Strategic/MilitiaSquads.cpp

@@ -664,7 +664,7 @@ void MoveMilitiaSquad(INT16 sMapX, INT16 sMapY, INT16 sTMapX, INT16 sTMapY, BOOL
 			StrategicRemoveMilitiaFromSector( sMapX, sMapY, ELITE_MILITIA, bElitesDestTeam );
 
 			// Flugente: move along individual militia data
-			MoveIndividualMilitiaProfiles( SECTOR( sMapX, sMapY ), SECTOR( sTMapX, sTMapY ), bGreensDestTeam, bRegularsDestTeam, bElitesDestTeam );
+			MoveIndividualMilitiaProfiles( SECTOR( sMapX, sMapY ), SECTOR( sTMapX, sTMapY ), greens, regulars, elites );
 
 			// Add half team to target sector
 			StrategicAddMilitiaToSector( sTMapX, sTMapY, GREEN_MILITIA, bGreensDestTeam );

Strategic/Town Militia.cpp

@@ -2379,6 +2379,9 @@ void HandleMilitiaUpkeepPayment( void )
 						// Increase tally of militia removed
 						++uiNumMilitiaDisbanded;
 						++usElitesDisbanded;
+
+						// Flugente: individual militia profiles need to be adjusted
+						DisbandIndividualMilitia( MilitiaList[0].ubSectorId, 0, 0, 1 );
 					}
 					else if (MilitiaList[0].ubNumMobileRegulars > 0)
 					{
@@ -2387,6 +2390,8 @@ void HandleMilitiaUpkeepPayment( void )
 						uiMoneyUnpaid -= gGameExternalOptions.usDailyCostMobile[REGULAR_MILITIA];
 						++uiNumMilitiaDisbanded;
 						++usRegularsDisbanded;
+
+						DisbandIndividualMilitia( MilitiaList[0].ubSectorId, 0, 1, 0 );
 					}
 					else if (MilitiaList[0].ubNumMobileGreens > 0)
 					{
@@ -2395,6 +2400,8 @@ void HandleMilitiaUpkeepPayment( void )
 						uiMoneyUnpaid -= gGameExternalOptions.usDailyCostMobile[GREEN_MILITIA];
 						++uiNumMilitiaDisbanded;
 						++usGreenDisbanded;
+
+						DisbandIndividualMilitia( MilitiaList[0].ubSectorId, 1, 0, 0 );
 					}							
 					else if (MilitiaList[0].ubNumTownElites > 0)
 					{
@@ -2403,6 +2410,8 @@ void HandleMilitiaUpkeepPayment( void )
 						uiMoneyUnpaid -= gGameExternalOptions.usDailyCostTown[ELITE_MILITIA];
 						++uiNumMilitiaDisbanded;
 						++usElitesDisbanded;
+
+						DisbandIndividualMilitia( MilitiaList[0].ubSectorId, 0, 0, 1 );
 					}
 					else if (MilitiaList[0].ubNumTownRegulars > 0)
 					{
@@ -2411,6 +2420,8 @@ void HandleMilitiaUpkeepPayment( void )
 						uiMoneyUnpaid -= gGameExternalOptions.usDailyCostTown[REGULAR_MILITIA];
 						++uiNumMilitiaDisbanded;
 						++usRegularsDisbanded;
+
+						DisbandIndividualMilitia( MilitiaList[0].ubSectorId, 0, 1, 0 );
 					}
 					else if (MilitiaList[0].ubNumTownGreens > 0)
 					{
@@ -2419,6 +2430,8 @@ void HandleMilitiaUpkeepPayment( void )
 						uiMoneyUnpaid -= gGameExternalOptions.usDailyCostTown[GREEN_MILITIA];
 						++uiNumMilitiaDisbanded;
 						++usGreenDisbanded;
+
+						DisbandIndividualMilitia( MilitiaList[0].ubSectorId, 1, 0, 0 );
 					}
 					else
 					{
@@ -2433,9 +2446,6 @@ void HandleMilitiaUpkeepPayment( void )
 				// Pay all we can
 				uiPayment = LaptopSaveInfo.iCurrentBalance;
 				
-				// Flugente: individual militia
-				DisbandIndividualMilitia( MilitiaList[0].ubSectorId, usGreenDisbanded, usRegularsDisbanded, usElitesDisbanded );
-
 				// Notify player that X militia have been automatically disbanded due to debt.
 				CHAR16 sString[256];
 				swprintf( sString, New113HAMMessage[21], uiNumMilitiaDisbanded );

Utils/_ChineseText.cpp

@@ -5122,18 +5122,17 @@ STR16 pWebPagesTitles[] =
 	L"%s新闻发布会 - 战役报告",
 	L"%s新闻发布会 - 最新消息",
 	L"%s新闻发布会 - 关于我们",
-	L"佣兵喜欢或不喜欢你 - 家",			 //L"Mercs Love or Dislike You - Home",
+	L"佣兵喜欢或不喜欢你 - 关于我们", //L"Mercs Love or Dislike You - About us",
 	L"佣兵喜欢或不喜欢你 - 队伍分析", //L"Mercs Love or Dislike You - Analyze a team",
 	L"佣兵喜欢或不喜欢你 - 成对对比", //L"Mercs Love or Dislike You - Pairwise comparison",
-	L"佣兵喜欢或不喜欢你 - 关于我们", //L"Mercs Love or Dislike You - About us",
+	L"Mercs Love or Dislike You - Personality",					// TODO.Translate
 	L"世界卫生组织 - 关于世界卫生组织", //L"WHO - About WHO",
 	L"世界卫生组织 - 阿鲁克的疾病", //L"WHO - Disease in Arulco",
 	L"世界卫生组织 - 有用的贴士", //L"WHO - Helpful Tips",
 	L"Kerberus安保公司 - 关于我们", //L"Kerberus - About Us",
 	L"Kerberus安保公司 - 雇佣队伍", //L"Kerberus - Hire a Team",
 	L"Kerberus安保公司 - 独立协议", //L"Kerberus - Individual Contracts",
-	L"民兵名单",//L"Militia Roster",
+	L"Militia Overview",										// TODO.Translate
-	L"民兵统计",//L"Militia Statistics",
 	L"Bobby Ray - 最近的运货",
 	L"百科全书",
 	L"百科全书 - 数据",
@@ -11078,12 +11077,6 @@ STR16	szMilitiaWebSite[] =
 	// main page
 	L"民兵",//L"Militia",
 	L"民兵力量总览",//L"Militia Forces Overview",
-
-	// links to other pages
-	L"民兵名单",//L"Militia Roster",
-	L"统计",//L"Statistics",
-	L"关于",//L"About",
-
 };
 
 STR16 szIndividualMilitiaBattleReportText[] =

Utils/_DutchText.cpp

@@ -5130,19 +5130,18 @@ STR16 pWebPagesTitles[] =
 	L"%s Press Council - Battle Reports",
 	L"%s Press Council - Latest News",
 	L"%s Press Council - About us",
-	L"Mercs Love or Dislike You - Home",				// TODO.Translate
+	L"Mercs Love or Dislike You - About us",
 	L"Mercs Love or Dislike You - Analyze a team",
 	L"Mercs Love or Dislike You - Pairwise comparison",
-	L"Mercs Love or Dislike You - About us",
+	L"Mercs Love or Dislike You - Personality",
 	L"WHO - About WHO",
 	L"WHO - Disease in Arulco",
 	L"WHO - Helpful Tips",
 	L"Kerberus - About Us",
 	L"Kerberus - Hire a Team",
 	L"Kerberus - Individual Contracts",
-	L"Militia Roster",			// TODO.Translate
+	L"Militia Overview",
-	L"Militia Statistics",
+	L"Bobby Ray's - Recent Shipments",
-	L"Bobby Ray's - Recentelijke Zendingen",
 	L"Encyclopedia",
 	L"Encyclopedia - Data",
 	L"Briefing Room",
@@ -11096,12 +11095,6 @@ STR16	szMilitiaWebSite[] =
 	// main page
 	L"Militia",
 	L"Militia Forces Overview",
-
-	// links to other pages
-	L"Militia Roster",
-	L"Statistics",
-	L"About",
-
 };
 
 STR16 szIndividualMilitiaBattleReportText[] =

Utils/_EnglishText.cpp

@@ -5119,19 +5119,17 @@ STR16 pWebPagesTitles[] =
 	L"%s Press Council - Battle Reports",
 	L"%s Press Council - Latest News",
 	L"%s Press Council - About us",
-	L"Mercs Love or Dislike You - Home",
+	L"Mercs Love or Dislike You - About us",
 	L"Mercs Love or Dislike You - Analyze a team",
 	L"Mercs Love or Dislike You - Pairwise comparison",
 	L"Mercs Love or Dislike You - Personality",
-	L"Mercs Love or Dislike You - About us",
 	L"WHO - About WHO",
 	L"WHO - Disease in Arulco",
 	L"WHO - Helpful Tips",
 	L"Kerberus - About Us",
 	L"Kerberus - Hire a Team",
 	L"Kerberus - Individual Contracts",
-	L"Militia Roster",
+	L"Militia Overview",
-	L"Militia Statistics",
 	L"Bobby Ray's - Recent Shipments",
 	L"Encyclopedia",
 	L"Encyclopedia - Data",
@@ -11077,12 +11075,6 @@ STR16	szMilitiaWebSite[] =
 	// main page
 	L"Militia",
 	L"Militia Forces Overview",
-
-	// links to other pages
-	L"Militia Roster",
-	L"Statistics",
-	L"About",
-	
 };
 
 STR16 szIndividualMilitiaBattleReportText[] =

Utils/_FrenchText.cpp

@@ -5135,18 +5135,17 @@ STR16 pWebPagesTitles[] =
 	L"%s, conseil de presse : Rapports",
 	L"%s, conseil de presse : Dernières nouvelles",
 	L"%s, conseil de presse : À propos de nous",
-	L"Mercs Love or Dislike You - Home",				// TODO.Translate
+	L"Mercs Love or Dislike You - About us",		// TODO.Translate
 	L"Mercs Love or Dislike You - Analyze a team",
 	L"Mercs Love or Dislike You - Pairwise comparison",
-	L"Mercs Love or Dislike You - About us",
+	L"Mercs Love or Dislike You - Personality",
 	L"WHO - About WHO",
 	L"WHO - Disease in Arulco",
 	L"WHO - Helpful Tips",
 	L"Kerberus - About Us",
 	L"Kerberus - Hire a Team",
 	L"Kerberus - Individual Contracts",
-	L"Militia Roster",			// TODO.Translate
+	L"Militia Overview",			// TODO.Translate
-	L"Militia Statistics",
 	L"Bobby Ray : Dernières commandes",
 	L"Encyclopédie",
 	L"Encyclopédie : Données",
@@ -11078,12 +11077,6 @@ STR16	szMilitiaWebSite[] =
 	// main page
 	L"Militia",
 	L"Militia Forces Overview",
-
-	// links to other pages
-	L"Militia Roster",
-	L"Statistics",
-	L"About",
-
 };
 
 STR16 szIndividualMilitiaBattleReportText[] =

Utils/_GermanText.cpp

@@ -5071,18 +5071,17 @@ STR16 pWebPagesTitles[] =
 	L"%s Presse Rat - Kampfberichte",
 	L"%s Presse Rat - Aktuellste Neuigkeiten",
 	L"%s Presse Rat - Über uns",
-	L"Mercs Love or Dislike You - Home",				// TODO.Translate
+	L"Mercs Love or Dislike You - About us",				// TODO.Translate
 	L"Mercs Love or Dislike You - Analyze a team",
 	L"Mercs Love or Dislike You - Pairwise comparison",
-	L"Mercs Love or Dislike You - About us",
+	L"Mercs Love or Dislike You - Personality",
 	L"WHO - About WHO",
 	L"WHO - Disease in Arulco",
 	L"WHO - Helpful Tips",
 	L"Kerberus - About Us",
 	L"Kerberus - Hire a Team",
 	L"Kerberus - Individual Contracts",
-	L"Militia Roster",			// TODO.Translate
+	L"Miliz - Übersicht",
-	L"Militia Statistics",
 	L"Bobby Rays - Letzte Lieferungen",
 	L"Enzyklopädie",
 	L"Enzyklopädie - Daten",
@@ -10908,12 +10907,6 @@ STR16	szMilitiaWebSite[] =
 	// main page
 	L"Militia",
 	L"Militia Forces Overview",
-
-	// links to other pages
-	L"Militia Roster",
-	L"Statistics",
-	L"About",
-
 };
 
 STR16 szIndividualMilitiaBattleReportText[] =

Utils/_ItalianText.cpp

@@ -5117,19 +5117,18 @@ STR16 pWebPagesTitles[] =
 	L"%s Press Council - Battle Reports",
 	L"%s Press Council - Latest News",
 	L"%s Press Council - About us",
-	L"Mercs Love or Dislike You - Home",				// TODO.Translate
+	L"Mercs Love or Dislike You - About us",		// TODO.Translate
 	L"Mercs Love or Dislike You - Analyze a team",
 	L"Mercs Love or Dislike You - Pairwise comparison",
-	L"Mercs Love or Dislike You - About us",
+	L"Mercs Love or Dislike You - Personality",
 	L"WHO - About WHO",
 	L"WHO - Disease in Arulco",
 	L"WHO - Helpful Tips",
 	L"Kerberus - About Us",
 	L"Kerberus - Hire a Team",
 	L"Kerberus - Individual Contracts",
-	L"Militia Roster",			// TODO.Translate
+	L"Militia Overview",
-	L"Militia Statistics",
+	L"Bobby Ray's - Recent Shipments",
-	L"Bobby Ray - Spedizioni recenti",
 	L"Encyclopedia",
 	L"Encyclopedia - Data",
 	L"Briefing Room",
@@ -11087,12 +11086,6 @@ STR16	szMilitiaWebSite[] =
 	// main page
 	L"Militia",
 	L"Militia Forces Overview",
-
-	// links to other pages
-	L"Militia Roster",
-	L"Statistics",
-	L"About",
-
 };
 
 STR16 szIndividualMilitiaBattleReportText[] =

Utils/_PolishText.cpp

@@ -5132,18 +5132,17 @@ STR16 pWebPagesTitles[] =
 	L"%s Press Council - Battle Reports",
 	L"%s Press Council - Latest News",
 	L"%s Press Council - About us",
-	L"Mercs Love or Dislike You - Home",				// TODO.Translate
+	L"Mercs Love or Dislike You - About us",				// TODO.Translate
 	L"Mercs Love or Dislike You - Analyze a team",
 	L"Mercs Love or Dislike You - Pairwise comparison",
-	L"Mercs Love or Dislike You - About us",
+	L"Mercs Love or Dislike You - Personality",
 	L"WHO - About WHO",
 	L"WHO - Disease in Arulco",
 	L"WHO - Helpful Tips",
 	L"Kerberus - About Us",
 	L"Kerberus - Hire a Team",
 	L"Kerberus - Individual Contracts",
-	L"Militia Roster",			// TODO.Translate
+	L"Militia Overview",			// TODO.Translate
-	L"Militia Statistics",
 	L"Bobby Ray's - Ostatnie dostawy",
 	L"Encyclopedia",
 	L"Encyclopedia - Dane",
@@ -11100,12 +11099,6 @@ STR16	szMilitiaWebSite[] =
 	// main page
 	L"Militia",
 	L"Militia Forces Overview",
-
-	// links to other pages
-	L"Militia Roster",
-	L"Statistics",
-	L"About",
-
 };
 
 STR16 szIndividualMilitiaBattleReportText[] =

Utils/_RussianText.cpp

@@ -5123,19 +5123,17 @@ STR16 pWebPagesTitles[] =
 	L"%s Пресс-служба - Боевые отчеты",
 	L"%s Пресс-служба - Последние новости",
 	L"%s Пресс-служба - О нас",
-	L"\"Бойцы Любят Тебя или Клянут\"",
+	L"\"Бойцы Любят Тебя или Клянут\" О нас",
 	L"\"Бойцы Любят Тебя или Клянут\" Анализ команды",
 	L"\"Бойцы Любят Тебя или Клянут\" Парные сравнения",
 	L"\"Бойцы Любят Тебя или Клянут\" Комментарии",
-	L"\"Бойцы Любят Тебя или Клянут\" О нас",
 	L"ВОЗ",
 	L"ВОЗ - Заболевания в Арулько",
 	L"ВОЗ - Полезно знать",
 	L"Цербер",
 	L"Цербер - Найм команды",
 	L"Цербер - Индивидуальные контракты",
-	L"Список ополчения",
+	L"Militia Overview",			// TODO.Translate
-	L"Статистика ополчения",
 	L"Бобби Рэй - последние поступления",
 	L"Энциклопедия",
 	L"Энциклопедия - данные",
@@ -11081,12 +11079,6 @@ STR16	szMilitiaWebSite[] =
 	// main page
 	L"Ополчение",
 	L"Силы ополчения",
-
-	// links to other pages
-	L"Список",
-	L"Статистика",
-	L"О нас",
-
 };
 
 STR16 szIndividualMilitiaBattleReportText[] =