]> git.mxchange.org Git - flightgear.git/commitdiff
cosmetics
authormfranz <mfranz>
Thu, 26 Jan 2006 22:22:37 +0000 (22:22 +0000)
committermfranz <mfranz>
Thu, 26 Jan 2006 22:22:37 +0000 (22:22 +0000)
src/GUI/new_gui.cxx

index a439440b92ab86b5cd58064d199143f86e0c4052..5f762dcb751efad9440710d75f817a09b819fe74 100644 (file)
@@ -418,26 +418,24 @@ FGFontCache::get(const char *name, float size, float slant)
 {
     _itt_t it;
 
-    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 {
+    if ((it = _fonts.find(name)) != _fonts.end())
         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 *