[Pingus-CVS] r3011 - in branches/pingus_sdl: . data/levels/tutorial src

[grumbel at BerliOS]

Author: grumbel
Date: 2007-08-22 16:40:04 +0200 (Wed, 22 Aug 2007)
New Revision: 3011

Modified:
   branches/pingus_sdl/TODO
   branches/pingus_sdl/data/levels/tutorial/miner-tutorial2-grumbel.pingus
   branches/pingus_sdl/data/levels/tutorial/snow16-grumbel.pingus
   branches/pingus_sdl/src/SConscript
   branches/pingus_sdl/src/story_screen.cpp
Log:
- fixed missing stretching in some levels
- fixed story scaling
- turned on optimizations

Modified: branches/pingus_sdl/TODO
===================================================================
--- branches/pingus_sdl/TODO    2007-08-22 05:49:34 UTC (rev 3010)
+++ branches/pingus_sdl/TODO    2007-08-22 14:40:04 UTC (rev 3011)
@@ -65,13 +65,10 @@
 
 - remove all the remaining unneeded debuging std::cout's
 
-- minser's heaven doesn't stretch the background
-
-- story doesn't scale to resolution
-
 - disable demo-writing per default
 
 - bridging gets more complicated has graphical error (background?!)
+  surface background doesn't handle larger res due to the Playfield being 
offsetted
 
 - there seems to be a bug in the sprite class causing a double-free,
  stuff broke in revision 2938 only got that as bug report, couldn't

Modified: 
branches/pingus_sdl/data/levels/tutorial/miner-tutorial2-grumbel.pingus
===================================================================
--- branches/pingus_sdl/data/levels/tutorial/miner-tutorial2-grumbel.pingus     
2007-08-22 05:49:34 UTC (rev 3010)
+++ branches/pingus_sdl/data/levels/tutorial/miner-tutorial2-grumbel.pingus     
2007-08-22 14:40:04 UTC (rev 3011)
@@ -28,8 +28,8 @@
       (para-x 0.5)
       (para-y 0.0)
       (stretch-x 0)
-      (stretch-y 0)
-      (keep-aspect 0)
+      (stretch-y 1)
+      (keep-aspect 1)
       (position 13.3571 25.2141 -150))
     (hotspot 
       (surface 

Modified: branches/pingus_sdl/data/levels/tutorial/snow16-grumbel.pingus
===================================================================
--- branches/pingus_sdl/data/levels/tutorial/snow16-grumbel.pingus      
2007-08-22 05:49:34 UTC (rev 3010)
+++ branches/pingus_sdl/data/levels/tutorial/snow16-grumbel.pingus      
2007-08-22 14:40:04 UTC (rev 3011)
@@ -30,8 +30,8 @@
       (para-x 0.5)
       (para-y 0.5)
       (stretch-x 0)
-      (stretch-y 0)
-      (keep-aspect 0)
+      (stretch-y 1)
+      (keep-aspect 1)
       (position -26 -3 -150))
     (hotspot 
       (surface 

Modified: branches/pingus_sdl/src/SConscript
===================================================================
--- branches/pingus_sdl/src/SConscript  2007-08-22 05:49:34 UTC (rev 3010)
+++ branches/pingus_sdl/src/SConscript  2007-08-22 14:40:04 UTC (rev 3011)
@@ -22,7 +22,7 @@
 
 env = Environment(# ENV = {'PKG_CONFIG_PATH' : os.getenv('PKG_CONFIG_PATH')},
                   CC = 'gcc',
-                  CCFLAGS = ['-O0', '-Wall', '-Werror', '-g'],
+                  CCFLAGS = ['-O2', '-Wall', '-Werror', '-g'],
                   CPPPATH = ['..', '.'])
 
 env.ParseConfig('sdl-config  --cflags --libs')

Modified: branches/pingus_sdl/src/story_screen.cpp
===================================================================
--- branches/pingus_sdl/src/story_screen.cpp    2007-08-22 05:49:34 UTC (rev 
3010)
+++ branches/pingus_sdl/src/story_screen.cpp    2007-08-22 14:40:04 UTC (rev 
3011)
@@ -147,6 +147,8 @@
   current_page = pages.back();
   page_surface = Resource::load_sprite(current_page.image);
   background   = Resource::load_sprite("core/menu/startscreenbg");
+  
+  background.scale(Display::get_width(), Display::get_height());
 }
 
 void