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

[grumbel at BerliOS]

Author: grumbel
Date: 2007-10-30 07:25:25 +0100 (Tue, 30 Oct 2007)
New Revision: 3394

Modified:
   trunk/pingus/TODO
   trunk/pingus/src/editor/editor_level.cpp
Log:
- fixed background position being wrong in editor

Modified: trunk/pingus/TODO
===================================================================
--- trunk/pingus/TODO   2007-10-30 06:24:52 UTC (rev 3393)
+++ trunk/pingus/TODO   2007-10-30 06:25:25 UTC (rev 3394)
@@ -175,8 +175,6 @@
 
 - implement option menu
 
-- make auto-scroll disableable in fullscreen
-
 - Regenerate Courier fonts for latin-1/2/9
 
 ### Loading font file: system://data/images/fonts/courier_small-iso-8859-9.font
@@ -198,7 +196,8 @@
 - Loading data/levels/playable/chouser02.pingus in Editor and saving
   it again causes the background to be at the wrong position (caused
   by level lacking position and editor setting a different fallback
-  then in-game)
+  then in-game) [Currently worked around in editor code, should be
+  fixed in the converter]
 
 - frameskip seems broken
 

Modified: trunk/pingus/src/editor/editor_level.cpp
===================================================================
--- trunk/pingus/src/editor/editor_level.cpp    2007-10-30 06:24:52 UTC (rev 
3393)
+++ trunk/pingus/src/editor/editor_level.cpp    2007-10-30 06:25:25 UTC (rev 
3394)
@@ -220,7 +220,12 @@
       attribs = obj->get_attribs();
 
       // All objects have a position - get that.
-      i->read_vector("position", p);
+      if (!i->read_vector("position", p))
+        { // Workaround for lack of position for background
+          if (i->get_name() == "surface-background")
+            p = Vector3f(0.f, 0.f, -150.f);
+        }
+
       obj->set_orig_pos(p);
       obj->set_pos(p);