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

[jsalmon3]

Author: jsalmon3
Date: 2007-09-15 06:43:46 +0200 (Sat, 15 Sep 2007)
New Revision: 3155

Modified:
   trunk/pingus/pingus.vcproj
   trunk/pingus/src/editor/object_selector_list.cpp
Log:
Fixed warning, updated vcproj

Modified: trunk/pingus/pingus.vcproj
===================================================================
--- trunk/pingus/pingus.vcproj  2007-09-15 04:29:32 UTC (rev 3154)
+++ trunk/pingus/pingus.vcproj  2007-09-15 04:43:46 UTC (rev 3155)
@@ -663,14 +663,6 @@
                                >
                        </File>
                        <File
-                               RelativePath=".\src\pixel_buffer.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\src\pixel_buffer.hpp"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\src\plf_res_mgr.cpp"
                                >
                        </File>
@@ -851,6 +843,14 @@
                                >
                        </File>
                        <File
+                               RelativePath=".\src\surface.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\surface.hpp"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\src\system.cpp"
                                >
                        </File>
@@ -1398,6 +1398,14 @@
                                        >
                                </File>
                                <File
+                                       
RelativePath=".\src\editor\object_selector_list.cpp"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath=".\src\editor\object_selector_list.hpp"
+                                       >
+                               </File>
+                               <File
                                        RelativePath=".\src\editor\panel.cpp"
                                        >
                                </File>

Modified: trunk/pingus/src/editor/object_selector_list.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector_list.cpp    2007-09-15 04:29:32 UTC 
(rev 3154)
+++ trunk/pingus/src/editor/object_selector_list.cpp    2007-09-15 04:43:46 UTC 
(rev 3155)
@@ -125,7 +125,7 @@
 
   LevelObj* create(const Vector2i& pos, LevelImpl* impl) { 
     LevelObj* obj = new LevelObj("surface-background", impl);
-    obj->set_pos(Vector3f(pos.x, pos.y, -1000.0f)); // FIXME: Hack, z-pos 
handling is messed up
+    obj->set_pos(Vector3f((float)pos.x, (float)pos.y, -1000.0f)); // FIXME: 
Hack, z-pos handling is messed up
     obj->set_para_x(1.0f);
     obj->set_para_y(1.0f);
     obj->set_scroll_x(0.0f);