mirror of
https://github.com/nillerusr/source-engine.git
synced 2026-08-08 09:49:36 +00:00
Merge pull request #43 from nillerusr/ToGLES3
ToGLES, and some other shit
This commit is contained in:
@@ -418,9 +418,9 @@ char *FindFontAndroid(bool bBold, int italic)
|
||||
else if( italic )
|
||||
fontFileNamePost = "Italic";
|
||||
else
|
||||
fontFileName = "Regular";
|
||||
fontFileNamePost = "Regular";
|
||||
|
||||
char dataFile[MAX_PATH];
|
||||
static char dataFile[MAX_PATH];
|
||||
|
||||
if( fontFileNamePost )
|
||||
snprintf( dataFile, sizeof dataFile, "/system/fonts/%s-%s.ttf", fontFileName, fontFileNamePost );
|
||||
@@ -431,7 +431,7 @@ char *FindFontAndroid(bool bBold, int italic)
|
||||
{
|
||||
fontFileNamePost = NULL;
|
||||
fontFileName = "DroidSans";
|
||||
if( bBold > 500 )
|
||||
if( bBold )
|
||||
fontFileNamePost = "Bold";
|
||||
|
||||
if( fontFileNamePost )
|
||||
@@ -464,7 +464,7 @@ char *CLinuxFont::GetFontFileName( const char *windowsFontName, int flags )
|
||||
|
||||
#ifdef ANDROID
|
||||
char *filename = FindFontAndroid( bBold, italic );
|
||||
Msg("Android font: %s", filename);
|
||||
Msg("Android font: %s\n", filename);
|
||||
if( !filename ) return NULL;
|
||||
return strdup( filename );
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user