diff -du gh-0835-src-org/sdlgfx.pp gh-0835-src/sdlgfx.pp --- gh-0835-src-org/sdlgfx.pp Thu Apr 15 20:43:08 2004 +++ gh-0835-src/sdlgfx.pp Tue May 18 11:51:32 2004 @@ -565,7 +565,11 @@ pmsg := QuickPCopy( msg ); { Call the alleged size calculation function. } +{$IFDEF UTF8} + TTF_SizeUTF8( F , pmsg , W , Y ); +{$ELSE} TTF_SizeText( F , pmsg , W , Y ); +{$ENDIF} { get rid of the PChar, since it's served its usefulness. } Dispose( pmsg ); @@ -645,7 +649,11 @@ SA := SList; while SA <> Nil do begin pline := QuickPCopy( SA^.Info ); +{$IFDEF UTF8} + S_Temp := TTF_RenderUTF8_Solid( game_font , pline , fg ); +{$ELSE} S_Temp := TTF_RenderText_Solid( game_font , pline , fg ); +{$ENDIF} Dispose( pline ); { We may or may not be required to do centering of the text. } @@ -678,7 +686,11 @@ MyText: PSDL_Surface; begin pline := QuickPCopy( msg ); +{$IFDEF UTF8} + MyText := TTF_RenderUTF8_Solid( game_font , pline , Color ); +{$ELSE} MyText := TTF_RenderText_Solid( game_font , pline , Color ); +{$ENDIF} Dispose( pline ); SDL_BlitSurface( MyText , Nil , Game_Screen , @MyDest ); SDL_FreeSurface( MyText ); @@ -846,7 +858,11 @@ MyDest := ZONE_Dialog; MyDest.Y := MyDest.Y + MyDest.H - TTF_FontLineSkip( game_font ); pline := QuickPCopy( TheLine ); +{$IFDEF UTF8} + S_Temp := TTF_RenderUTF8_Solid( game_font , pline , InfoGreen ); +{$ELSE} S_Temp := TTF_RenderText_Solid( game_font , pline , InfoGreen ); +{$ENDIF} Dispose( pline ); SDL_BlitSurface( S_Temp , Nil , Game_Screen , @MyDest ); SDL_FreeSurface( S_Temp ); @@ -1001,7 +1017,11 @@ for t := 1 to ( ZONE_MoreText.H div TTF_FontLineSkip( game_font ) ) do begin if CLine <> Nil then begin pline := QuickPCopy( CLine^.Info ); +{$IFDEF UTF8} + MyImage := TTF_RenderUTF8_Solid( game_font , pline , NeutralGrey ); +{$ELSE} MyImage := TTF_RenderText_Solid( game_font , pline , NeutralGrey ); +{$ENDIF} Dispose( pline ); SDL_BlitSurface( MyImage , Nil , Game_Screen , @MyDest ); SDL_FreeSurface( MyImage ); @@ -1128,8 +1148,13 @@ Game_Font := TTF_OpenFont( 'Image/VeraBd.ttf' , 14 ); Info_Font := TTF_OpenFont( 'Image/VeraMoBd.ttf' , 11 ); {$ELSE} +{$IFDEF UTF8} + Game_Font := TTF_OpenFont( 'Image\utf8.ttf' , 14 ); + Info_Font := TTF_OpenFont( 'Image\utf8.ttf' , 11 ); +{$ELSE} Game_Font := TTF_OpenFont( 'Image\VeraBd.ttf' , 14 ); Info_Font := TTF_OpenFont( 'Image\VeraMoBd.ttf' , 11 ); +{$ENDIF} {$ENDIF} Text_Messages := LoadStringList( Standard_Message_File ); diff -du gh-0835-src-org/sdlinfo.pp gh-0835-src/sdlinfo.pp --- gh-0835-src-org/sdlinfo.pp Mon Apr 19 00:50:44 2004 +++ gh-0835-src/sdlinfo.pp Tue May 18 11:53:23 2004 @@ -109,7 +109,11 @@ PLine: PChar; begin pline := QuickPCopy( msg ); +{$IFDEF UTF8} + MyImage := TTF_RenderUTF8_Solid( Game_Font , pline , C ); +{$ELSE} MyImage := TTF_RenderText_Solid( Game_Font , pline , C ); +{$ENDIF} Dispose( pline ); if MyImage <> Nil then CDest.X := CZone.X + ( ( CZone.W - MyImage^.W ) div 2 ); @@ -127,7 +131,11 @@ PLine: PChar; begin pline := QuickPCopy( msg ); +{$IFDEF UTF8} + MyImage := TTF_RenderUTF8_Solid( Info_Font , pline , C ); +{$ELSE} MyImage := TTF_RenderText_Solid( Info_Font , pline , C ); +{$ENDIF} Dispose( pline ); CDest.X := CZone.X + ( ( CZone.W - MyImage^.W ) div 2 ); @@ -146,7 +154,11 @@ PLine: PChar; begin pline := QuickPCopy( msg ); +{$IFDEF UTF8} + MyImage := TTF_RenderUTF8_Solid( Info_Font , pline , C ); +{$ELSE} MyImage := TTF_RenderText_Solid( Info_Font , pline , C ); +{$ENDIF} Dispose( pline ); CDest.X := CZone.X; @@ -164,7 +176,11 @@ PLine: PChar; begin pline := QuickPCopy( msg ); +{$IFDEF UTF8} + MyImage := TTF_RenderUTF8_Solid( Info_Font , pline , C ); +{$ELSE} MyImage := TTF_RenderText_Solid( Info_Font , pline , C ); +{$ENDIF} Dispose( pline ); CDest.X := CZone.X + Tab; @@ -180,7 +196,11 @@ PLine: PChar; begin pline := QuickPCopy( msg ); +{$IFDEF UTF8} + MyImage := TTF_RenderUTF8_Solid( Info_Font , pline , C ); +{$ELSE} MyImage := TTF_RenderText_Solid( Info_Font , pline , C ); +{$ENDIF} Dispose( pline ); CDest.X := CZone.X + Tab - MyImage^.W; diff -du gh-0835-src-org/sdlmenus.pp gh-0835-src/sdlmenus.pp --- gh-0835-src-org/sdlmenus.pp Tue Mar 9 14:16:46 2004 +++ gh-0835-src/sdlmenus.pp Tue May 18 11:54:08 2004 @@ -357,7 +357,11 @@ NextColor := @RPM^.itemcolor; Item_PText := QuickPCopy( a^.msg ); +{$IFDEF UTF8} + Item_Image := TTF_RenderUTF8_Solid( game_font , Item_PText , NextColor^ ); +{$ELSE} Item_Image := TTF_RenderText_Solid( game_font , Item_PText , NextColor^ ); +{$ENDIF} Dispose( Item_PText ); SDL_BlitSurface( Item_Image , Nil , Game_Screen , @MyDest ); SDL_FreeSurface( Item_Image );