38 lines
1.7 KiB
Diff
38 lines
1.7 KiB
Diff
|
Index: Cataclysm-DDA-0.E/src/sdltiles.cpp
|
||
|
|
===================================================================
|
||
|
|
--- Cataclysm-DDA-0.E.orig/src/sdltiles.cpp
|
||
|
|
+++ Cataclysm-DDA-0.E/src/sdltiles.cpp
|
||
|
|
@@ -3246,7 +3246,7 @@ static void font_folder_list( std::ostre
|
||
|
|
}
|
||
|
|
|
||
|
|
// Add font family
|
||
|
|
- char *fami = TTF_FontFaceFamilyName( fnt.get() );
|
||
|
|
+ const char *fami = TTF_FontFaceFamilyName( fnt.get() );
|
||
|
|
if( fami != nullptr ) {
|
||
|
|
fout << fami;
|
||
|
|
} else {
|
||
|
|
@@ -3254,7 +3254,7 @@ static void font_folder_list( std::ostre
|
||
|
|
}
|
||
|
|
|
||
|
|
// Add font style
|
||
|
|
- char *style = TTF_FontFaceStyleName( fnt.get() );
|
||
|
|
+ const char *style = TTF_FontFaceStyleName( fnt.get() );
|
||
|
|
bool isbitmap = ends_with( f, ".fon" );
|
||
|
|
if( style != nullptr && !isbitmap && strcasecmp( style, "Regular" ) != 0 ) {
|
||
|
|
fout << " " << style;
|
||
|
|
@@ -3365,12 +3365,12 @@ static int test_face_size( const std::st
|
||
|
|
{
|
||
|
|
const TTF_Font_Ptr fnt( TTF_OpenFontIndex( f.c_str(), size, faceIndex ) );
|
||
|
|
if( fnt ) {
|
||
|
|
- char *style = TTF_FontFaceStyleName( fnt.get() );
|
||
|
|
+ const char *style = TTF_FontFaceStyleName( fnt.get() );
|
||
|
|
if( style != nullptr ) {
|
||
|
|
int faces = TTF_FontFaces( fnt.get() );
|
||
|
|
for( int i = faces - 1; i >= 0; i-- ) {
|
||
|
|
const TTF_Font_Ptr tf( TTF_OpenFontIndex( f.c_str(), size, i ) );
|
||
|
|
- char *ts = nullptr;
|
||
|
|
+ const char *ts = nullptr;
|
||
|
|
if( tf ) {
|
||
|
|
if( nullptr != ( ts = TTF_FontFaceStyleName( tf.get() ) ) ) {
|
||
|
|
if( 0 == strcasecmp( ts, style ) && TTF_FontHeight( tf.get() ) <= size ) {
|