[Pingus-CVS] r2800 - in branches/pingus_sdl: . src

[jsalmon3]

Author: jsalmon3
Date: 2007-08-04 21:45:22 +0200 (Sat, 04 Aug 2007)
New Revision: 2800

Modified:
   branches/pingus_sdl/pingus.vcproj
   branches/pingus_sdl/src/font_test_screen.cpp
Log:
Added font_test_screen, fixed warnings



Modified: branches/pingus_sdl/pingus.vcproj
===================================================================
--- branches/pingus_sdl/pingus.vcproj   2007-08-04 19:37:15 UTC (rev 2799)
+++ branches/pingus_sdl/pingus.vcproj   2007-08-04 19:45:22 UTC (rev 2800)
@@ -411,6 +411,14 @@
                                >
                        </File>
                        <File
+                               RelativePath=".\src\font_test_screen.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\font_test_screen.hpp"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\src\fonts.cpp"
                                >
                        </File>

Modified: branches/pingus_sdl/src/font_test_screen.cpp
===================================================================
--- branches/pingus_sdl/src/font_test_screen.cpp        2007-08-04 19:37:15 UTC 
(rev 2799)
+++ branches/pingus_sdl/src/font_test_screen.cpp        2007-08-04 19:45:22 UTC 
(rev 2800)
@@ -39,7 +39,7 @@
 bool
 FontTestScreen::draw(DrawingContext& gc)
 {
-  int checker = 40;
+  float checker = 40.f;
   for(int y = 0; y < gc.get_height()/checker; y += 1)
     for(int x = 0; x < gc.get_width()/checker; x += 1)
       {
@@ -60,8 +60,8 @@
 
   for(int i = 0; i < 256; ++i)
     {
-      int x = 64 + (i%20)*(font.get_height() + 4);
-      int y = 64 + (i/20)*(font.get_height() + 6);
+      float x = 64.f + (i%20)*(font.get_height() + 4);
+      float y = 64.f + (i/20)*(font.get_height() + 6);
 
       if (font.get_width(char(i)))
         {