[Pingus-CVS] r2795 - in branches/pingus_sdl: data/images/fonts src

[grumbel at BerliOS]

Author: grumbel
Date: 2007-08-04 19:38:51 +0200 (Sat, 04 Aug 2007)
New Revision: 2795

Modified:
   branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-1.font
   branches/pingus_sdl/src/font.cpp
Log:
- removed debug output
- fixed error message in courier_small-iso-8859-1.font

Modified: branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-1.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-1.font 
2007-08-04 15:42:50 UTC (rev 2794)
+++ branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-1.font 
2007-08-04 17:38:51 UTC (rev 2795)
@@ -3,9 +3,12 @@
  (name "Pingus Small")
  (space-length    8)
  (alpha-threshold  0)
- (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
-             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
-             
"���������������������������������������������������������������������������������������������")
+ (characters
+  "!\"#$%&'()*+,-./0123456789:;<=>?@"
+  "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+  "���������������") ;; FIXME: Are those last few chars even latin1?
+                     ;; anyway, font needs to be redone or removed,
+                     ;; but this workaround will do for now
  (image "data/images/fonts/courier_small2.png"))
 
 ;; EOF ;;

Modified: branches/pingus_sdl/src/font.cpp
===================================================================
--- branches/pingus_sdl/src/font.cpp    2007-08-04 15:42:50 UTC (rev 2794)
+++ branches/pingus_sdl/src/font.cpp    2007-08-04 17:38:51 UTC (rev 2795)
@@ -97,8 +97,8 @@
 
                 if (idx < int(desc.characters.size()))
                   {
-                    std::cout << idx << " '" << desc.characters[idx] << "' " 
-                              <<  " glyph: " << first << " - " << x << 
std::endl;
+                    //std::cout << idx << " '" << desc.characters[idx] << "' " 
+                    //          <<  " glyph: " << first << " - " << x << 
std::endl;
 
                     SDL_Rect& rect = chrs[static_cast<unsigned 
char>(desc.characters[idx])];
                     rect.x = first;