upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-16 18:31:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed non-existent font files being tried to open all the time.

Browse Source 
Removed obsolete function set_font
This commit is contained in:
Jon Daniel 2005-08-07 22:15:44 +00:00
parent 63e1a43bf0
commit 62c243cb89
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/font.cpp
View File

@ -286,12 +286,6 @@ manager::~manager()
TTF_Quit(); TTF_Quit();
} }
void set_font()
{
clear_fonts();
font_names.push_back(_("DejaVuSans.ttf"));
}
void set_font_list(const std::vector<subset_descriptor>& fontlist) void set_font_list(const std::vector<subset_descriptor>& fontlist)
{ {
clear_fonts(); clear_fonts();
@ -299,8 +293,27 @@ void set_font_list(const std::vector<subset_descriptor>& fontlist)
std::vector<subset_descriptor>::const_iterator itor; std::vector<subset_descriptor>::const_iterator itor;
for(itor = fontlist.begin(); itor != fontlist.end(); ++itor) { for(itor = fontlist.begin(); itor != fontlist.end(); ++itor) {
subset_id subset = font_names.size(); const subset_id subset = font_names.size();
font_names.push_back(itor->name); // Insert fonts only if the font file exists
#ifndef USE_ZIPIOS
if(game_config::path.empty() == false) {
if(file_exists(game_config::path + "/fonts/" + itor->name)) {
font_names.push_back(itor->name);
}
} else {
if(file_exists("fonts/" + itor->name)) {
font_names.push_back(itor->name);
}
}
#else
if (!read_file("fonts/" + itor->name).empty()) {
font_names.push_back(itor->name);
}
#endif
if(font_names.back() != itor->name) {
WRN_FT << "Failed opening font file '" << itor->name << "'\n";
continue;
}
std::vector<std::pair<size_t,size_t> >::const_iterator cp_range; std::vector<std::pair<size_t,size_t> >::const_iterator cp_range;
for(cp_range = itor->present_codepoints.begin(); for(cp_range = itor->present_codepoints.begin();