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

[grumbel at BerliOS]

Author: grumbel
Date: 2007-09-15 03:09:22 +0200 (Sat, 15 Sep 2007)
New Revision: 3149

Modified:
   trunk/pingus/TODO
   trunk/pingus/src/smallmap_image.cpp
   trunk/pingus/src/sprite.cpp
   trunk/pingus/src/surface.cpp
   trunk/pingus/src/surface.hpp
Log:
- fixed bug in SpriteImpl creation
- some indention fixes

Modified: trunk/pingus/TODO
===================================================================
--- trunk/pingus/TODO   2007-09-15 00:59:40 UTC (rev 3148)
+++ trunk/pingus/TODO   2007-09-15 01:09:22 UTC (rev 3149)
@@ -117,10 +117,6 @@
   f      - flip
   r      - rotate
 
-- exit align looks ok, object flipping/rotation is broken (due to
-  change in loading (pb->sprite) I guess)
-  -> Resource::load_sprite() doesn't apply modifier
-
 - make combo box open to the top or bottom depending on variable
 
 - ObjectSelector scroll limit is missing, also doesn't display all objects

Modified: trunk/pingus/src/smallmap_image.cpp
===================================================================
--- trunk/pingus/src/smallmap_image.cpp 2007-09-15 00:59:40 UTC (rev 3148)
+++ trunk/pingus/src/smallmap_image.cpp 2007-09-15 01:09:22 UTC (rev 3149)
@@ -95,65 +95,65 @@
           int i = y * pitch + 4 * x;
 
 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
-              const int red   = 3;
-              const int green = 2;
-              const int blue  = 1;
-              const int alpha = 0;
+          const int red   = 3;
+          const int green = 2;
+          const int blue  = 1;
+          const int alpha = 0;
 #else
-              const int red   = 0;
-              const int green = 1;
-              const int blue  = 2;
-              const int alpha = 3;
+          const int red   = 0;
+          const int green = 1;
+          const int blue  = 2;
+          const int alpha = 3;
 #endif 
 
           switch (colmap->getpixel_fast(x * cmap_width  / width,
                                         y * cmap_height / height))
             {
-            case Groundtype::GP_NOTHING:
-              cbuffer[i + red]   = 0;
-              cbuffer[i + green] = 0;
-              cbuffer[i + blue]  = 0;
-              cbuffer[i + alpha] = 255;
-              break;
+              case Groundtype::GP_NOTHING:
+                cbuffer[i + red]   = 0;
+                cbuffer[i + green] = 0;
+                cbuffer[i + blue]  = 0;
+                cbuffer[i + alpha] = 255;
+                break;
 
-            case Groundtype::GP_BRIDGE:
-              cbuffer[i + red]   =   0;
-              cbuffer[i + green] = 255;
-              cbuffer[i + blue]  = 100;
-              cbuffer[i + alpha] = 255;
-              break;
+              case Groundtype::GP_BRIDGE:
+                cbuffer[i + red]   =   0;
+                cbuffer[i + green] = 255;
+                cbuffer[i + blue]  = 100;
+                cbuffer[i + alpha] = 255;
+                break;
 
-            case Groundtype::GP_WATER:
-            case Groundtype::GP_LAVA:
-              cbuffer[i + red]   = 0;
-              cbuffer[i + green] = 0;
-              cbuffer[i + blue]  = 200;
-              cbuffer[i + alpha] = 255;
-              break;
+              case Groundtype::GP_WATER:
+              case Groundtype::GP_LAVA:
+                cbuffer[i + red]   = 0;
+                cbuffer[i + green] = 0;
+                cbuffer[i + blue]  = 200;
+                cbuffer[i + alpha] = 255;
+                break;
 
 #if 0
-              // FIXME: temporaty disabled for 0.6.0 release, since all 
liquids are currently lava
-            case Groundtype::GP_LAVA:
-              cbuffer[i + 3] = 255; // alpha
-              cbuffer[i + 2] = 255; // blue
-              cbuffer[i + 1] = 128;   // green
-              cbuffer[i + 0] = 128;   // red
-              break;
+                // FIXME: temporaty disabled for 0.6.0 release, since all 
liquids are currently lava
+              case Groundtype::GP_LAVA:
+                cbuffer[i + 3] = 255; // alpha
+                cbuffer[i + 2] = 255; // blue
+                cbuffer[i + 1] = 128;   // green
+                cbuffer[i + 0] = 128;   // red
+                break;
 #endif
 
-            case Groundtype::GP_SOLID:
-              cbuffer[i + red]   = 100;
-              cbuffer[i + green] = 100;
-              cbuffer[i + blue]  = 100;
-              cbuffer[i + alpha] = 255;
-              break;
+              case Groundtype::GP_SOLID:
+                cbuffer[i + red]   = 100;
+                cbuffer[i + green] = 100;
+                cbuffer[i + blue]  = 100;
+                cbuffer[i + alpha] = 255;
+                break;
 
-            default:
-              cbuffer[i + red]   = 200;
-              cbuffer[i + green] = 200;
-              cbuffer[i + blue]  = 200;
-              cbuffer[i + alpha] = 255;
-              break;
+              default:
+                cbuffer[i + red]   = 200;
+                cbuffer[i + green] = 200;
+                cbuffer[i + blue]  = 200;
+                cbuffer[i + alpha] = 255;
+                break;
             }
        }
     }

Modified: trunk/pingus/src/sprite.cpp
===================================================================
--- trunk/pingus/src/sprite.cpp 2007-09-15 00:59:40 UTC (rev 3148)
+++ trunk/pingus/src/sprite.cpp 2007-09-15 01:09:22 UTC (rev 3149)
@@ -92,8 +92,9 @@
     optimize();
   }
 
-  SpriteImpl(const Surface& surface)
-    : offset(0,0),
+  SpriteImpl(const Surface& surface_)
+    : surface(surface_),
+      offset(0,0),
       frame_pos(0,0),
       frame_size(surface.get_width(), surface.get_height()),
       frame_delay(0),

Modified: trunk/pingus/src/surface.cpp
===================================================================
--- trunk/pingus/src/surface.cpp        2007-09-15 00:59:40 UTC (rev 3148)
+++ trunk/pingus/src/surface.cpp        2007-09-15 01:09:22 UTC (rev 3149)
@@ -255,7 +255,7 @@
 void
 Surface::optimize()
 {
-  if (!impl->optimized)
+  if (impl.get() && !impl->optimized)
     {
       // FIXME: Could add a check to check if the surface is already optimized
       SDL_Surface* old_surface = impl->surface;

Modified: trunk/pingus/src/surface.hpp
===================================================================
--- trunk/pingus/src/surface.hpp        2007-09-15 00:59:40 UTC (rev 3148)
+++ trunk/pingus/src/surface.hpp        2007-09-15 01:09:22 UTC (rev 3149)
@@ -62,7 +62,6 @@
   int get_height() const;
   int get_pitch()  const;
 
-
   void blit(const Surface& source, int x, int y);
 
   Color get_pixel(int x, int y) const;