[Pingus-CVS] r3086 - in trunk/pingus: . src/editor

[jsalmon3]

Author: jsalmon3
Date: 2007-09-05 05:42:34 +0200 (Wed, 05 Sep 2007)
New Revision: 3086

Modified:
   trunk/pingus/pingus.vcproj
   trunk/pingus/src/editor/panel.cpp
Log:
Updated editor files, fixed warnings

Modified: trunk/pingus/pingus.vcproj
===================================================================
--- trunk/pingus/pingus.vcproj  2007-09-05 03:08:14 UTC (rev 3085)
+++ trunk/pingus/pingus.vcproj  2007-09-05 03:42:34 UTC (rev 3086)
@@ -1222,14 +1222,6 @@
                                        >
                                </File>
                                <File
-                                       
RelativePath=".\src\editor\editor_panel.cpp"
-                                       >
-                               </File>
-                               <File
-                                       
RelativePath=".\src\editor\editor_panel.hpp"
-                                       >
-                               </File>
-                               <File
                                        
RelativePath=".\src\editor\editor_screen.cpp"
                                        >
                                </File>
@@ -1246,14 +1238,6 @@
                                        >
                                </File>
                                <File
-                                       
RelativePath=".\src\editor\level_head.cpp"
-                                       >
-                               </File>
-                               <File
-                                       
RelativePath=".\src\editor\level_head.hpp"
-                                       >
-                               </File>
-                               <File
                                        
RelativePath=".\src\editor\level_impl.hpp"
                                        >
                                </File>
@@ -1266,11 +1250,11 @@
                                        >
                                </File>
                                <File
-                                       
RelativePath=".\src\editor\panel_buttons.cpp"
+                                       RelativePath=".\src\editor\panel.cpp"
                                        >
                                </File>
                                <File
-                                       
RelativePath=".\src\editor\panel_buttons.hpp"
+                                       RelativePath=".\src\editor\panel.hpp"
                                        >
                                </File>
                        </Filter>

Modified: trunk/pingus/src/editor/panel.cpp
===================================================================
--- trunk/pingus/src/editor/panel.cpp   2007-09-05 03:08:14 UTC (rev 3085)
+++ trunk/pingus/src/editor/panel.cpp   2007-09-05 03:42:34 UTC (rev 3086)
@@ -99,7 +99,7 @@
 
     if (mouse_over)
       {
-        gc.print_center(Fonts::courier_small, pos.x + 17, pos.y + 38, tooltip);
+        gc.print_center(Fonts::courier_small, pos.x + 17.f, pos.y + 38.f, 
tooltip);
       }
   }
 
@@ -208,9 +208,9 @@
 Panel::draw (DrawingContext& gc)
 {
   // FIXME: Could use draw_line
-  gc.draw_fillrect(0, 0, Display::get_width(), 38, Color(255, 255, 255));
-  gc.draw_fillrect(1, 1, Display::get_width(), 38, Color(169, 157, 140));
-  gc.draw_fillrect(1, 1, Display::get_width()-1, 37, Color(237, 233, 227));
+  gc.draw_fillrect(0, 0, float(Display::get_width()), 38, Color(255, 255, 
255));
+  gc.draw_fillrect(1, 1, float(Display::get_width()), 38, Color(169, 157, 
140));
+  gc.draw_fillrect(1, 1, float(Display::get_width()-1), 37, Color(237, 233, 
227));
 }
 
 void