[Pingus-CVS] r3523 - in trunk/pingus/src: actions display

[grumbel at BerliOS]

Author: grumbel
Date: 2007-12-25 19:56:18 +0100 (Tue, 25 Dec 2007)
New Revision: 3523

Modified:
   trunk/pingus/src/actions/jumper.cpp
   trunk/pingus/src/display/scene_test.cpp
Log:
- fixed wall jump

Modified: trunk/pingus/src/actions/jumper.cpp
===================================================================
--- trunk/pingus/src/actions/jumper.cpp 2007-12-25 04:28:11 UTC (rev 3522)
+++ trunk/pingus/src/actions/jumper.cpp 2007-12-25 18:56:18 UTC (rev 3523)
@@ -29,9 +29,9 @@
   : PinguAction(p)
 {
   sprite.load(Direction::LEFT,  Resource::load_sprite("pingus/player" + 
-    pingu->get_owner_str() + "/jumper/left"));
+                                                      pingu->get_owner_str() + 
"/jumper/left"));
   sprite.load(Direction::RIGHT, Resource::load_sprite("pingus/player" + 
-    pingu->get_owner_str() + "/jumper/right"));
+                                                      pingu->get_owner_str() + 
"/jumper/right"));
 }
 
 void
@@ -44,11 +44,17 @@
 Jumper::update ()
 {
   // if climber, do a wall-jump, else just jump forward
-  if ((pingu->get_previous_action() == Actions::Climber) 
-      ? pingu->direction.is_left() : pingu->direction.is_right())
-    pingu->set_velocity(pingu->get_velocity() + Vector3f(5.0, -5.0));
-  else 
-    pingu->set_velocity(pingu->get_velocity() + Vector3f(-5.0, -5.0));
+  if ((pingu->get_previous_action() == Actions::Climber))
+    pingu->direction.change();
+  
+  if (pingu->direction.is_left())
+    {
+      pingu->set_velocity(pingu->get_velocity() + Vector3f(-5.0, -5.0));
+    }
+  else // if (pingu->direction.is_right())
+    {
+      pingu->set_velocity(pingu->get_velocity() + Vector3f(5.0, -5.0));
+    }
 
   // Move the pingu in the air, so that it can start 'falling'
   pingu->set_y(pingu->get_y() - 1);

Modified: trunk/pingus/src/display/scene_test.cpp
===================================================================
--- trunk/pingus/src/display/scene_test.cpp     2007-12-25 04:28:11 UTC (rev 
3522)
+++ trunk/pingus/src/display/scene_test.cpp     2007-12-25 18:56:18 UTC (rev 
3523)
@@ -15,7 +15,6 @@
   }
   atexit(SDL_Quit);
 
-
   global_screen = SDL_SetVideoMode(640, 480, 32, SDL_HWSURFACE);
 
   SDL_Event event;