[Pingus-CVS] r3964 - trunk/pingus/src

[grumbel at BerliOS]

Author: grumbel
Date: 2009-02-25 20:42:46 +0100 (Wed, 25 Feb 2009)
New Revision: 3964

Modified:
   trunk/pingus/src/font_description.cpp
   trunk/pingus/src/font_description.hpp
Log:
Removed some unneeded member variables

Modified: trunk/pingus/src/font_description.cpp
===================================================================
--- trunk/pingus/src/font_description.cpp       2009-02-25 12:34:50 UTC (rev 
3963)
+++ trunk/pingus/src/font_description.cpp       2009-02-25 19:42:46 UTC (rev 
3964)
@@ -38,8 +38,6 @@
 FontDescription::FontDescription(const Pathname& pathname_)
   : pathname(pathname_)
 {
-  name             = "<unknown>";
-  monospace        = false;
   char_spacing     = 1.0f;
   vertical_spacing = 1.0f;
 
@@ -51,7 +49,6 @@
     }
   else
     {
-      reader.read_string("name",            name);
       reader.read_path("image",             image);
       reader.read_float("char-spacing",     char_spacing);
       reader.read_float("vertical-spacing", vertical_spacing);

Modified: trunk/pingus/src/font_description.hpp
===================================================================
--- trunk/pingus/src/font_description.hpp       2009-02-25 12:34:50 UTC (rev 
3963)
+++ trunk/pingus/src/font_description.hpp       2009-02-25 19:42:46 UTC (rev 
3964)
@@ -41,20 +41,19 @@
 {
 public:
   Pathname    pathname;
-  std::string name;
 
-  /** Image file from which the basic surface is loaded */
-  Pathname image;
-
-  bool monospace;
-  
   /** Space between two characters */
   float char_spacing;
-
+  
+  /** Spacing between lines, given in multiples of \a size */
   float vertical_spacing;
 
+  /** Vertical height of the font */
   int size;
 
+  /** Image file from which the basic surface is loaded */
+  Pathname image;
+
   /** Characters in the font image */
   std::vector<GlyphDescription> glyphs;