[Pingus-CVS] r2608 - in trunk/src: actions display gui

[jave27]

Author: jave27
Date: 2006-01-19 01:38:15 +0100 (Thu, 19 Jan 2006)
New Revision: 2608

Modified:
   trunk/src/actions/faller.cxx
   trunk/src/display/drawing_context.cxx
   trunk/src/gui/screen_manager.cxx
Log:
Fixed issue with jumper changing direction.
Reverted Z position hack - leveldots disappeared after I did it.
Bypassed entire ScreenManager::fade_over() function - it doesn't work 
well for most screen changes.


Modified: trunk/src/actions/faller.cxx
===================================================================
--- trunk/src/actions/faller.cxx        2006-01-18 22:07:42 UTC (rev 2607)
+++ trunk/src/actions/faller.cxx        2006-01-19 00:38:15 UTC (rev 2608)
@@ -95,7 +95,7 @@
 
          // If the Pingu collided into something while moving down...
          if (velocity.y > 0.0f
-             && rel_getpixel(0, -1) != Groundtype::GP_NOTHING)
+             && rel_getpixel(0, -2) != Groundtype::GP_NOTHING)
            {
              // Ping is on ground/water/something
              if (   rel_getpixel(0, -1) == Groundtype::GP_WATER

Modified: trunk/src/display/drawing_context.cxx
===================================================================
--- trunk/src/display/drawing_context.cxx       2006-01-18 22:07:42 UTC (rev 
2607)
+++ trunk/src/display/drawing_context.cxx       2006-01-19 00:38:15 UTC (rev 
2608)
@@ -257,8 +257,7 @@
 {
   // FIXME: Z handling isn't working correctly - sprite with negative Z values
        // FIXME: aren't being displayed.
-       //draw(sprite, pos.x, pos.y, pos.z);
-       draw(sprite, pos.x, pos.y, 0);
+       draw(sprite, pos.x, pos.y, pos.z);
 }
 
 void

Modified: trunk/src/gui/screen_manager.cxx
===================================================================
--- trunk/src/gui/screen_manager.cxx    2006-01-18 22:07:42 UTC (rev 2607)
+++ trunk/src/gui/screen_manager.cxx    2006-01-19 00:38:15 UTC (rev 2608)
@@ -241,6 +241,9 @@
 void
 ScreenManager::fade_over (ScreenPtr& old_screen, ScreenPtr& new_screen)
 {
+       // FIXME: This entire function doesn't work very well.
+       if (0)
+       {
   DeltaManager delta_manager;
   float passed_time = 0;
 
@@ -277,6 +280,7 @@
 
       progress = passed_time/1.0f;
     }
+       }
 }
 
 void