mirror of
https://github.com/1dot13/source.git
synced 2026-08-05 14:00:23 +02:00
Merged revision(s) 7254 from branches/ja2_source_official_2014:
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:
@@ -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
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user