1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged from revision: 7134

Browse Source 
- Externalized country name and noun to cities.xml (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7135 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-04-06 14:43:48 +00:00
parent 9c7e84a81b
commit 4c0bd0e03a
17 changed files with 332 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/CampaignHistoryMain.cpp
+25 -3
View File
@@ -125,7 +125,7 @@ void RenderCampaignHistory()
usPosX = LAPTOP_SCREEN_UL_X;
usPosY = LAPTOP_SCREEN_WEB_UL_Y + 80;
swprintf(sText, szCampaignHistoryWebSite[TEXT_CAMPAIGNHISTORY_DESCRIPTION_1] );
swprintf(sText, szCampaignHistoryWebSite[TEXT_CAMPAIGNHISTORY_DESCRIPTION_1], pCountryNames[COUNTRY_NAME]);
usPosY += DisplayWrappedString( usPosX, usPosY, LAPTOP_SCREEN_LR_X-LAPTOP_SCREEN_UL_X, 2, CAMPHIS_FONT_MED, CAMPHIS_FONT_COLOR, sText, FONT_MCOLOR_BLACK, FALSE, 0);
for(int i = TEXT_CAMPAIGNHISTORY_NAME_MINISTRY; i < TEXT_CAMPAIGNHISTORY_NAME_PRESSORGANISATION_SUBTITLE; ++i)
@@ -133,7 +133,19 @@ void RenderCampaignHistory()
// display bullet
BltVideoObject(FRAME_BUFFER, hPixHandle, 0, usPosX, usPosY, VO_BLT_SRCTRANSPARENCY,NULL);
swprintf(sText, szCampaignHistoryWebSite[i] );
switch( i )
{
case TEXT_CAMPAIGNHISTORY_NAME_REBEL:
case TEXT_CAMPAIGNHISTORY_NAME_PRESSORGANISATION_SUBTITLE:
swprintf(sText, szCampaignHistoryWebSite[i], pCountryNames[COUNTRY_NAME] );
break;
case TEXT_CAMPAIGNHISTORY_NAME_MINISTRY:
swprintf(sText, szCampaignHistoryWebSite[i], pCountryNames[COUNTRY_NOUN] );
break;
default:
swprintf(sText, szCampaignHistoryWebSite[i] );
}
DrawTextToScreen( sText, usPosX + 25, usPosY, LAPTOP_SCREEN_LR_X-LAPTOP_SCREEN_UL_X, CAMPHIS_FONT_MED, CAMPHIS_FONT_COLOR, FONT_MCOLOR_BLACK, FALSE, 0 );
usPosY += 15;
@@ -236,11 +248,21 @@ void RemoveCampaignHistoryDefaults()
void GetCampaignHistoryText( UINT8 ubNumber, STR16 pString )
{
UINT32 uiStartLoc=0;
CHAR16 sText[800];
if ( ubNumber >= TEXT_CAMPAIGNHISTORY_MAX )
wcscpy( pString, L"bla" );
wcscpy( pString, szCampaignHistoryWebSite[ubNumber] );
switch( ubNumber )
{
case TEXT_CAMPAIGNHISTORY_NAME_PRESSORGANISATION:
case TEXT_CAMPAIGNHISTORY_NAME_PRESSORGANISATION_SUBTITLE:
swprintf( sText, szCampaignHistoryWebSite[ ubNumber ], pCountryNames[COUNTRY_NAME] );
wcscpy( pString, sText );
break;
default:
wcscpy( pString, szCampaignHistoryWebSite[ubNumber] );
}
}
Laptop/CampaignHistory_Summary.cpp
+1 -1
View File
@@ -700,7 +700,7 @@ void RenderCampaignHistory_MostImportant()
if ( incident.usIncidentFlags & INCIDENT_SAMSITE_SABOTAGED )
{
swprintf(sText, szCampaignHistoryDetail[TEXT_CAMPAIGNHISTORY_DETAIL_SAMSITESABOTAGED] );
swprintf(sText, szCampaignHistoryDetail[TEXT_CAMPAIGNHISTORY_DETAIL_SAMSITESABOTAGED], pCountryNames[COUNTRY_NOUN], pCountryNames[COUNTRY_NAME] );
usPosY += DisplayWrappedString( usPosX, usPosY, LAPTOP_SCREEN_LR_X - usPosX, 2, CAMPHIS_FONT_SMALL, CAMPAIGN_HISTORY_FONT_COLOR_REGULAR,sText, FONT_MCOLOR_BLACK, FALSE, 0);
if ( picend < usPosY ) usPosX = LAPTOP_SCREEN_UL_X;
}
Laptop/laptop.cpp
+8 -2
View File
@@ -6264,7 +6264,7 @@ BOOLEAN RenderWWWProgramTitleBar( void )
HVOBJECT hHandle;
VOBJECT_DESC VObjectDesc;
INT32 iIndex = 0;
CHAR16 sString[256];
CHAR16 sString[256], sTemp[256];
// title bar - load
VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
@@ -6298,7 +6298,13 @@ BOOLEAN RenderWWWProgramTitleBar( void )
{
iIndex = guiCurrentLaptopMode - LAPTOP_MODE_WWW-1;
swprintf( sString, L"%s - %s", pWebTitle[0], pWebPagesTitles[ iIndex ] );
if( iIndex >= 33 && iIndex <= 36 )
{
swprintf( sTemp, pWebPagesTitles[ iIndex ], pCountryNames[COUNTRY_NAME] );
swprintf( sString, L"%s - %s", pWebTitle[0], sTemp );
}
else
swprintf( sString, L"%s - %s", pWebTitle[0], pWebPagesTitles[ iIndex ] );
mprintf(iScreenWidthOffset + 140 ,iScreenHeightOffset + 33 ,sString);
}