[Pingus-CVS] CVS: Games/Pingus/src/actions climber.cxx,1.18,1.19 climber.hxx,1.12,1.13

[torangan]

Update of /usr/local/cvsroot/Games/Pingus/src/actions
In directory dark:/tmp/cvs-serv12104/actions

Modified Files:
        climber.cxx climber.hxx 
Log Message:
applied Gervases direction patch


Index: climber.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/climber.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- climber.cxx 13 Oct 2002 20:25:00 -0000      1.18
+++ climber.cxx 26 Oct 2002 09:14:23 -0000      1.19
@@ -26,23 +26,10 @@
 
 Climber::Climber (Pingu* p)
   : PinguAction(p),
-    sprite(Sprite ("Pingus/climber0", "pingus"))
+    sprite(Sprite ("Pingus/climber0", "pingus")),
+    sprite_width(sprite.get_width()),
+    sprite_height(sprite.get_height())
 {
-  // these alignments are necessary to prevent climber walking 
-  // inside the wall.
-  int sprite_height = sprite.get_height();
-  int sprite_width  = sprite.get_width();
-
-  if (pingu->direction.is_left()) 
-    {
-      sprite.set_align(0, -sprite_height/2);
-      sprite.set_direction(Sprite::LEFT); 
-    } 
-  else 
-    {
-      sprite.set_align(-sprite_width, -sprite_height/2);
-      sprite.set_direction(Sprite::RIGHT);
-    }
 }
 
 void
@@ -56,14 +43,26 @@
     printf("%3d %3d %3d\n", rel_getpixel(1,-1), 
rel_getpixel(0,-1),rel_getpixel(-1, -1));
   */  
 
+  // This is necessary to prevent climber walking inside a wall.
+  if (pingu->direction.is_left()) 
+    {
+      sprite.set_align(0, -sprite_height/2);
+      sprite.set_direction(Sprite::LEFT); 
+    } 
+  else 
+    {
+      sprite.set_align(-sprite_width, -sprite_height/2);
+      sprite.set_direction(Sprite::RIGHT);
+    }
+
   sprite.update();
 
   // If above is free
-  if (rel_getpixel(0, 1) ==  Groundtype::GP_NOTHING
-      || rel_getpixel (0, 1) ==  Groundtype::GP_BRIDGE)
+  if (   rel_getpixel(0, 1) == Groundtype::GP_NOTHING
+      || rel_getpixel(0, 1) == Groundtype::GP_BRIDGE)
     {
       // and there is still ground to walk on
-      if (rel_getpixel(1, 1) !=  Groundtype::GP_NOTHING) 
+      if (rel_getpixel(1, 1) != Groundtype::GP_NOTHING) 
        {
          pingu->set_pos(pingu->get_x(), 
                         pingu->get_y() - 1);

Index: climber.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/climber.hxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- climber.hxx 13 Oct 2002 16:40:01 -0000      1.12
+++ climber.hxx 26 Oct 2002 09:14:23 -0000      1.13
@@ -29,6 +29,9 @@
 {
 private:
   Sprite sprite;
+  int sprite_width;
+  int sprite_height;
+
 public:
   Climber (Pingu*);