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

Merged revision(s) 7254 from branches/ja2_source_official_2014:

Browse Source 
Deleted TAIWANESE language versions.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7255 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-06-02 19:00:06 +00:00
parent 8927918913
commit b118cf07b7
23 changed files with 10 additions and 9452 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Civ Quotes.cpp
+1 -9
View File
@@ -411,12 +411,7 @@ void BeginCivQuote( SOLDIERTYPE *pCiv, UINT16 ubCivQuoteID, UINT16 ubEntryID, IN
return;
}
#ifdef TAIWANESE
swprintf( gzCivQuote, L"%s", zQuote );
#else
swprintf( gzCivQuote, L"\"%s\"", zQuote );
#endif
if ( ubCivQuoteID == CIV_QUOTE_HINT )
{
@@ -1913,11 +1908,8 @@ void StartEnemyTaunt( SOLDIERTYPE *pCiv, TAUNTTYPE iTauntType, SOLDIERTYPE *pTar
{
swprintf( sTauntText, zApplicableTaunts[ iChosenTaunt ].szText );
}
#ifdef TAIWANESE
swprintf( gzTauntQuote, L"%s", sTauntText );
#else
swprintf( gzTauntQuote, L"\"%s\"", sTauntText );
#endif
// block this enemy from taunting for a time being
uiTauntFinishTimes[pCiv->ubID] = GetJA2Clock() + min( gTauntsSettings.sMaxDelay , max( gTauntsSettings.sMinDelay, FindDelayForString( gzTauntQuote ) + gTauntsSettings.sModDelay ) );
Tactical/Dialogue Control.cpp
-19
View File
@@ -2731,13 +2731,9 @@ void HandleTacticalNPCTextUI( UINT8 ubCharacterNum, STR16 zQuoteStr )
}
// post message to mapscreen message system
#ifdef TAIWANESE
swprintf( gTalkPanel.zQuoteStr, L"%s", zQuoteStr );
#else
swprintf( gTalkPanel.zQuoteStr, L"\"%s\"", zQuoteStr );
swprintf( zText, L"%s: \"%s\"", gMercProfiles[ ubCharacterNum ].zNickname, zQuoteStr );
MapScreenMessage( FONT_MCOLOR_WHITE, MSG_DIALOG, L"%s", zText );
#endif
}
@@ -2747,7 +2743,6 @@ void DisplayTextForExternalNPC( UINT8 ubCharacterNum, STR16 zQuoteStr )
CHAR16 zText[ QUOTE_MESSAGE_SIZE ];
INT16 sLeft;
// Setup dialogue text box
if ( guiCurrentScreen != MAP_SCREEN )
{
@@ -2756,13 +2751,9 @@ void DisplayTextForExternalNPC( UINT8 ubCharacterNum, STR16 zQuoteStr )
}
// post message to mapscreen message system
#ifdef TAIWANESE
swprintf( gTalkPanel.zQuoteStr, L"%s", zQuoteStr );
#else
swprintf( gTalkPanel.zQuoteStr, L"\"%s\"", zQuoteStr );
swprintf( zText, L"%s: \"%s\"", gMercProfiles[ ubCharacterNum ].zNickname, zQuoteStr );
MapScreenMessage( FONT_MCOLOR_WHITE, MSG_DIALOG, L"%s", zText );
#endif
if ( guiCurrentScreen == MAP_SCREEN )
{
@@ -2789,11 +2780,7 @@ void HandleTacticalTextUI( INT32 iFaceIndex, SOLDIERTYPE *pSoldier, STR16 zQuote
//BUild text
// How do we do this with defines?
//swprintf( zText, L"\xb4\xa2 %s: \xb5 \"%s\"", gMercProfiles[ ubCharacterNum ].zNickname, zQuoteStr );
#ifdef TAIWANESE
swprintf( zText, L"%s", zQuoteStr );
#else
swprintf( zText, L"\"%s\"", zQuoteStr );
#endif
// TODO.RW: Wenn wir in tactical sind, dann normal. In strategy den offset dazurechnen!
if ( guiCurrentScreen == GAME_SCREEN )
@@ -2809,12 +2796,6 @@ void HandleTacticalTextUI( INT32 iFaceIndex, SOLDIERTYPE *pSoldier, STR16 zQuote
//sLeft = 110;
ExecuteTacticalTextBox( sLeft, zText );
#ifndef TAIWANESE
swprintf( zText, L"%s: \"%s\"", gMercProfiles[ pSoldier->ubProfile ].zNickname, zQuoteStr );
MapScreenMessage( FONT_MCOLOR_WHITE, MSG_DIALOG, L"%s", zText );
#endif
}
Tactical/Morale.h
+2
View File
@@ -324,4 +324,6 @@ void HandleDynamicOpinionTeamDrinking( SOLDIERTYPE* pSoldier );
UINT8 HighestInventoryCoolness( SOLDIERTYPE* pSoldier );
void HandleDynamicOpinionDialogue();
#endif
Tactical/ShopKeeper Interface.cpp
+1 -8
View File
@@ -5219,7 +5219,6 @@ BOOLEAN IsGunOrAmmoOfSameTypeSelected( OBJECTTYPE *pItemObject )
return( TRUE );
}
return( FALSE );
}
@@ -5228,12 +5227,7 @@ void InitShopKeeperSubTitledText( STR16 pString )
//Clear the contents of the subtitle text
memset( gsShopKeeperTalkingText, 0, SKI_SUBTITLE_TEXT_SIZE );
#ifdef TAIWANESE
swprintf( gsShopKeeperTalkingText, L"%s", pString );
#else
swprintf( gsShopKeeperTalkingText, L"\"%s\"", pString );
#endif
//Now setup the popup box
if( gGameSettings.fOptions[ TOPTION_SUBTITLES ] )
@@ -5242,8 +5236,7 @@ void InitShopKeeperSubTitledText( STR16 pString )
UINT16 usActualHeight=0;
giPopUpBoxId = PrepareMercPopupBox( giPopUpBoxId, BASIC_MERC_POPUP_BACKGROUND, BASIC_MERC_POPUP_BORDER, gsShopKeeperTalkingText, 300, 0, 0, 0, &usActualWidth, &usActualHeight);
// gusPositionOfSubTitlesX = ( 640 - usActualWidth ) / 2 ;
//position it to start under the guys face
Tactical/XML.h
-1
View File
@@ -49,7 +49,6 @@ typedef PARSE_STAGE;
#define POLISH_PREFIX "Polish."
#define FRENCH_PREFIX "French."
#define ITALIAN_PREFIX "Italian."
#define TAIWANESE_PREFIX "Taiwanese."
#define CHINESE_PREFIX "Chinese."
#define ATTACHMENTSFILENAME "Items\\Attachments.xml"