[Pingus-CVS] rev 2326 - in trunk: . src

[Kenneth Gangstoe]

Author: sphair
Date: 2004-05-09 21:36:09 +0200 (Sun, 09 May 2004)
New Revision: 2326

Modified:
   trunk/Pingus.vcproj
   trunk/src/fps_counter.cxx
   trunk/src/pingus_main.cxx
Log:
- Fixed FPS counter

Modified: trunk/Pingus.vcproj
===================================================================
--- trunk/Pingus.vcproj 2004-05-09 18:16:15 UTC (rev 2325)
+++ trunk/Pingus.vcproj 2004-05-09 19:36:09 UTC (rev 2326)
@@ -1522,16 +1522,16 @@
                                        RelativePath=".\src\blitter_impl.hxx">
                                </File>
                                <File
-                                       RelativePath=".\src\button_panel.cxx">
+                                       RelativePath=".\src\blitter_test.cxx">
                                </File>
                                <File
-                                       RelativePath=".\src\button_panel.hxx">
+                                       RelativePath=".\src\blitter_test.hxx">
                                </File>
                                <File
-                                       RelativePath=".\src\canvas.cxx">
+                                       RelativePath=".\src\button_panel.cxx">
                                </File>
                                <File
-                                       RelativePath=".\src\canvas.hxx">
+                                       RelativePath=".\src\button_panel.hxx">
                                </File>
                                <File
                                        
RelativePath=".\src\capture_rectangle.cxx">
@@ -2056,12 +2056,6 @@
                                        
RelativePath=".\src\resource_modifier.hxx">
                                </File>
                                <File
-                                       RelativePath=".\src\resources.cxx">
-                               </File>
-                               <File
-                                       RelativePath=".\src\resources.hxx">
-                               </File>
-                               <File
                                        RelativePath=".\src\result.cxx">
                                </File>
                                <File

Modified: trunk/src/fps_counter.cxx
===================================================================
--- trunk/src/fps_counter.cxx   2004-05-09 18:16:15 UTC (rev 2325)
+++ trunk/src/fps_counter.cxx   2004-05-09 19:36:09 UTC (rev 2326)
@@ -37,13 +37,13 @@
 {
 }
 
-
 // We are not initialising the fpscounter in the constructor, 'cause
 // that doesn't work (ClanLib hasn't init the display at that point)
 void
 FPSCounter::init()
 {
   font = Fonts::pingus_small;
+  font.set_alignment(origin_top_right);
   start_time = CL_System::get_time();
   strcat(fps_string, _("unknown"));
   fps_count = 0;
@@ -52,14 +52,14 @@
 void
 FPSCounter::on_event()
 {
-#ifdef CLANLIB_0_6
   update_fps_counter();
 
   if (odd_frame)
     {
-      font.print_right(CL_Display::get_width(),
-                       CL_Display::get_height() - (2 * font.get_height()),
-                       "o");
+      font.draw(CL_Display::get_width(),
+                CL_Display::get_height() - (2 * font.get_height()),
+                "o");
+
       odd_frame = false;
     }
   else
@@ -67,10 +67,9 @@
       odd_frame = true;
     }
 
-  font.print_right(CL_Display::get_width(),
-                   CL_Display::get_height() - font.get_height(),
-                   fps_string);
-#endif
+  font.draw(CL_Display::get_width(),
+            CL_Display::get_height() - font.get_height(),
+            fps_string);
 }
 
 void

Modified: trunk/src/pingus_main.cxx
===================================================================
--- trunk/src/pingus_main.cxx   2004-05-09 18:16:15 UTC (rev 2325)
+++ trunk/src/pingus_main.cxx   2004-05-09 19:36:09 UTC (rev 2326)
@@ -940,8 +940,8 @@
     std::cout << _("Pingus: Unknown throw caught!") << std::endl;
   }
 
-      deinit_pingus();
-      deinit_clanlib();
+  deinit_pingus();
+  deinit_clanlib();
 
 #if defined WIN32 && defined _DEBUG
   cl_console.wait_for_key();