fly/flightgear
1
0
Fork 0
Code Activity

cosmetics

Browse source
This commit is contained in:
mfranz 2006-01-26 22:22:37 +00:00
parent e2016f9568
commit f729ec6013
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/GUI/new_gui.cxx
View file

@ -418,26 +418,24 @@ FGFontCache::get(const char *name, float size, float slant)
{ {
_itt_t it; _itt_t it;
if ((it = _fonts.find(name)) == _fonts.end()) { if ((it = _fonts.find(name)) != _fonts.end())
SGPath path(_path);
path.append(name);
fnt *f = new fnt();
f->texfont = new fntTexFont;
if (f->texfont->load((char *)path.c_str())) {
f->pufont = new puFont;
f->pufont->initialize(static_cast<fntFont *>(f->texfont), size, slant);
_fonts[name] = f;
return f->pufont;
} else {
delete f;
return _fonts["default"]->pufont;
}
} else {
return it->second->pufont; return it->second->pufont;
SGPath path(_path);
path.append(name);
fnt *f = new fnt();
f->texfont = new fntTexFont;
if (f->texfont->load((char *)path.c_str())) {
f->pufont = new puFont;
f->pufont->initialize(static_cast<fntFont *>(f->texfont), size, slant);
_fonts[name] = f;
return f->pufont;
} }
delete f;
return _fonts["default"]->pufont;
} }
puFont * puFont *