diff --git a/Laptop/MilitiaWebsite.cpp b/Laptop/MilitiaWebsite.cpp index 416a9d80..aeef1668 100644 --- a/Laptop/MilitiaWebsite.cpp +++ b/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 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 ); diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index 4d3254c5..261e215c 100644 --- a/Utils/_ChineseText.cpp +++ b/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"民兵统计",//L"Militia Statistics", + L"Militia Overview", // TODO.Translate 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[] = diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index 74b73b74..5d92ee4a 100644 --- a/Utils/_DutchText.cpp +++ b/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 Statistics", - L"Bobby Ray's - Recentelijke Zendingen", + L"Militia Overview", + L"Bobby Ray's - Recent Shipments", 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[] = diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index ff325136..ef2569dd 100644 --- a/Utils/_EnglishText.cpp +++ b/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 Statistics", + L"Militia Overview", 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[] = diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index 6e6ee66f..b80787ec 100644 --- a/Utils/_FrenchText.cpp +++ b/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 Statistics", + L"Militia Overview", // TODO.Translate 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[] = diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index 0ff5eda4..0a3133a3 100644 --- a/Utils/_GermanText.cpp +++ b/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"Militia Statistics", + L"Miliz - Übersicht", 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[] = diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index b794350b..2543a4b6 100644 --- a/Utils/_ItalianText.cpp +++ b/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 Statistics", - L"Bobby Ray - Spedizioni recenti", + L"Militia Overview", + L"Bobby Ray's - Recent Shipments", 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[] = diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index 0e10d10c..187801d8 100644 --- a/Utils/_PolishText.cpp +++ b/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 Statistics", + L"Militia Overview", // TODO.Translate 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[] = diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 1b71d927..83a4ef81 100644 --- a/Utils/_RussianText.cpp +++ b/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"Статистика ополчения", + L"Militia Overview", // TODO.Translate L"Бобби Рэй - последние поступления", L"Энциклопедия", L"Энциклопедия - данные", @@ -11081,12 +11079,6 @@ STR16 szMilitiaWebSite[] = // main page L"Ополчение", L"Силы ополчения", - - // links to other pages - L"Список", - L"Статистика", - L"О нас", - }; STR16 szIndividualMilitiaBattleReportText[] =