1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +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/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