[Pingus-CVS] CVS: Games/Pingus/src fonts.cxx,1.7,1.8

[Ingo Ruhnke]

Update of /var/lib/cvs/Games/Pingus/src
In directory dark:/tmp/cvs-serv9067/src

Modified Files:
        fonts.cxx 
Log Message:
- bunch of more font fixes and signal fixes
- worldmap is now showing too, at least partly

Index: fonts.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/fonts.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- fonts.cxx   13 Dec 2003 15:10:44 -0000      1.7
+++ fonts.cxx   13 Dec 2003 23:41:11 -0000      1.8
@@ -41,7 +41,7 @@
 void
 init ()
 {
-#ifndef CLANLIB_0_6
+#ifdef CLANLIB_0_6
   // FIXME: Just a workaround, no fix
   pingus_small = PingusResource::load_font("Fonts/pingus_small","fonts");
   xterm        = pingus_small;
@@ -60,21 +60,24 @@
 
   lcd          = pingus_small;
 #else 
-  pingus_small = PingusResource::load_font("Fonts/pingus_small", "fonts");
-  pingus_small_fix_num = 
PingusResource::load_font("Fonts/pingus_small_fix_num", "fonts");
-  pingus_large = PingusResource::load_font("Fonts/pingus","fonts");
-
-  chalk_large  = PingusResource::load_font("Fonts/chalk_large","fonts");
+  chalk_large  = PingusResource::load_font("Fonts/chalk_normal","fonts"); 
+  //PingusResource::load_font("Fonts/chalk_large","fonts");
   chalk_normal = PingusResource::load_font("Fonts/chalk_normal","fonts");
   chalk_small  = PingusResource::load_font("Fonts/chalk_small","fonts");
 
+  pingus_small = PingusResource::load_font("Fonts/pingus_small", "fonts");
+  pingus_small_fix_num = 
PingusResource::load_font("Fonts/pingus_small_fix_num", "fonts");
+  pingus_large = PingusResource::load_font("Fonts/pingus_small", "fonts");
+  //PingusResource::load_font("Fonts/pingus","fonts");
+
   courier_small = PingusResource::load_font("Fonts/courier_small", "fonts");
 
-  xterm        = PingusResource::load_font("Fonts/xterm","fonts");
-  smallfont    = PingusResource::load_font("Fonts/smallfont","fonts");
-  smallfont_h  = PingusResource::load_font("Fonts/smallfont_h","fonts");
+  xterm        = PingusResource::load_font("Fonts/courier_small", "fonts");
+  //PingusResource::load_font("Fonts/xterm","fonts");
+  smallfont    = PingusResource::load_font("Fonts/courier_small", "fonts"); 
//PingusResource::load_font("Fonts/smallfont","fonts");
+  smallfont_h  = PingusResource::load_font("Fonts/courier_small", "fonts"); // 
PingusResource::load_font("Fonts/smallfont_h","fonts");
 
-  lcd          = PingusResource::load_font("Fonts/numbers", "fonts");
+  lcd          = PingusResource::load_font("Fonts/courier_small", "fonts"); // 
PingusResource::load_font("Fonts/numbers", "fonts");
 #endif
 }