don't use arial as default system font name on linux

This commit is contained in:
UnknownShadow200 2018-10-07 23:33:16 +11:00
parent 4810b55461
commit 0e031d3886
3 changed files with 10 additions and 7 deletions

View File

@ -384,10 +384,10 @@ static void Game_LoadGuiOptions(void) {
Game_UseClassicOptions = Options_GetBool(OPT_CLASSIC_OPTIONS, false) || Game_ClassicMode;
Game_TabAutocomplete = Options_GetBool(OPT_TAB_AUTOCOMPLETE, false);
Options_Get(OPT_FONT_NAME, &Game_FontName, "Arial");
Options_Get(OPT_FONT_NAME, &Game_FontName, Font_DefaultName);
if (Game_ClassicMode) {
Game_FontName.length = 0;
String_AppendConst(&Game_FontName, "Arial");
String_AppendConst(&Game_FontName, Font_DefaultName);
}
/* TODO: Handle Arial font not working */

View File

@ -33,8 +33,9 @@
#define Win_Return(success) ((success) ? 0 : GetLastError())
HANDLE heap;
char* Platform_NewLine = "\r\n";
char Directory_Separator = '\\';
char* Platform_NewLine = "\r\n";
char Directory_Separator = '\\';
char* Font_DefaultName = "Arial";
ReturnCode ReturnCode_FileShareViolation = ERROR_SHARING_VIOLATION;
ReturnCode ReturnCode_FileNotFound = ERROR_FILE_NOT_FOUND;
@ -70,9 +71,10 @@ ReturnCode ReturnCode_SocketWouldBlock = WSAEWOULDBLOCK;
#define Nix_Return(success) ((success) ? 0 : errno)
pthread_mutex_t event_mutex;
char* Platform_NewLine = "\n";
char Directory_Separator = '/';
char Directory_Separator = '/';
char* Font_DefaultName = "Century Schoolbook L Roman";
ReturnCode ReturnCode_FileShareViolation = 1000000000; /* TODO: not used apparently */
ReturnCode ReturnCode_FileNotFound = ENOENT;
ReturnCode ReturnCode_NotSupported = EPERM;

View File

@ -16,7 +16,8 @@ typedef int SocketPtr;
#endif
extern char* Platform_NewLine; /* Newline for text */
extern char Directory_Separator;
extern char Directory_Separator;
extern char* Font_DefaultName;
extern ReturnCode ReturnCode_FileShareViolation;
extern ReturnCode ReturnCode_FileNotFound;
extern ReturnCode ReturnCode_NotSupported;