X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fplayer.cpp;h=d09b97fca1b99ceade0720b6ffb068a6f2117adb;hb=657fc40723665c04b3150946f5bd66b6b0af9230;hp=02cfc131cf2b3d72cc1005a6478208c3b4119227;hpb=8b651d9d18f93952a9f735d2eef74680dfb95de5;p=supertux.git

diff --git a/src/object/player.cpp b/src/object/player.cpp
index 02cfc131c..d09b97fca 100644
--- a/src/object/player.cpp
+++ b/src/object/player.cpp
@@ -18,39 +18,38 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <config.h>
 
-#include <typeinfo>
-#include <cmath>
-#include <iostream>
-#include <cassert>
+#include "player.hpp"
 
-#include "gettext.hpp"
-#include "sprite/sprite_manager.hpp"
 #include "audio/sound_manager.hpp"
-#include "player.hpp"
-#include "tile.hpp"
-#include "sprite/sprite.hpp"
-#include "sector.hpp"
-#include "resources.hpp"
-#include "statistics.hpp"
+#include "badguy/badguy.hpp"
+#include "control/codecontroller.hpp"
+#include "control/joystickkeyboardcontroller.hpp"
+#include "display_effect.hpp"
+#include "log.hpp"
+#include "falling_coin.hpp"
 #include "game_session.hpp"
-#include "object/tilemap.hpp"
+#include "gettext.hpp"
+#include "main.hpp"
+#include "object/bullet.hpp"
 #include "object/camera.hpp"
-#include "object/particles.hpp"
 #include "object/portable.hpp"
-#include "object/bullet.hpp"
-#include "trigger/trigger_base.hpp"
-#include "control/joystickkeyboardcontroller.hpp"
-#include "scripting/squirrel_util.hpp"
-#include "main.hpp"
-#include "platform.hpp"
-#include "badguy/badguy.hpp"
+#include "object/sprite_particle.hpp"
+#include "object/tilemap.hpp"
+#include "particles.hpp"
 #include "player_status.hpp"
-#include "log.hpp"
-#include "falling_coin.hpp"
 #include "random_generator.hpp"
-#include "object/sprite_particle.hpp"
+#include "sector.hpp"
+#include "scripting/squirrel_util.hpp"
+#include "sprite/sprite.hpp"
+#include "sprite/sprite_manager.hpp"
+#include "tile.hpp"
 #include "trigger/climbable.hpp"
 
+#include <typeinfo>
+#include <cmath>
+#include <iostream>
+#include <cassert>
+
 //#define SWIMMING
 
 namespace {
@@ -373,17 +372,13 @@ Player::update(float elapsed_time)
       Vector ppos = Vector(px, py);
       Vector pspeed = Vector(0, 0);
       Vector paccel = Vector(0, 0);
-      // draw bright sparkle when there is lots of time left, dark sparkle when invincibility is about to end
-      if (invincible_timer.get_timeleft() > TUX_INVINCIBLE_TIME_WARNING) {
-        // make every other a longer sparkle to make trail a bit fuzzy
-        if (size_t(game_time*20)%2) {
-          Sector::current()->add_object(new SpriteParticle("images/objects/particles/sparkle.sprite", "small", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_OBJECTS+1+5));
-        } else {
-          Sector::current()->add_object(new SpriteParticle("images/objects/particles/sparkle.sprite", "medium", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_OBJECTS+1+5));
-        }
-      } else {
-        Sector::current()->add_object(new SpriteParticle("images/objects/particles/sparkle.sprite", "dark", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_OBJECTS+1+5));
-      }
+      Sector::current()->add_object(new SpriteParticle("images/objects/particles/sparkle.sprite", 
+         // draw bright sparkle when there is lots of time left, dark sparkle when invincibility is about to end
+         (invincible_timer.get_timeleft() > TUX_INVINCIBLE_TIME_WARNING) ?
+              // make every other a longer sparkle to make trail a bit fuzzy
+              (size_t(game_time*20)%2) ? "small" : "medium"
+         :
+              "dark", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_OBJECTS+1+5));
     }
   }
 
@@ -418,9 +413,9 @@ Player::apply_friction()
     float friction = WALK_ACCELERATION_X * (on_ice ? ICE_FRICTION_MULTIPLIER : NORMAL_FRICTION_MULTIPLIER);
     if(physic.get_velocity_x() < 0) {
       physic.set_acceleration_x(friction);
-    } else /*if(physic.get_velocity_x() > 0)*/ {
+    } else if(physic.get_velocity_x() > 0) {
       physic.set_acceleration_x(-friction);
-    }
+    } // no friction for physic.get_velocity_x() == 0
   }
 }
 
@@ -689,16 +684,10 @@ Player::handle_input()
   }
 
   /* Peeking */
-  if( controller->released( Controller::PEEK_LEFT ) ) {
+  if( controller->released( Controller::PEEK_LEFT ) || controller->released( Controller::PEEK_RIGHT ) ) {
     peekingX = AUTO;
   }
-  if( controller->released( Controller::PEEK_RIGHT ) ) {
-    peekingX = AUTO;
-  }
-  if( controller->released( Controller::PEEK_UP ) ) {
-    peekingY = AUTO;
-  }
-  if( controller->released( Controller::PEEK_DOWN ) ) {
+  if( controller->released( Controller::PEEK_UP ) || controller->released( Controller::PEEK_DOWN ) ) {
     peekingY = AUTO;
   }
   if( controller->pressed( Controller::PEEK_LEFT ) ) {
@@ -1091,7 +1080,7 @@ Player::collision_tile(uint32_t tile_attributes)
   }
 #endif
 
-  if(tile_attributes & (Tile::ICE | Tile::SOLID)) {
+  if(tile_attributes & Tile::ICE) {
     ice_this_frame = true;
     on_ice = true;
   }
@@ -1252,9 +1241,7 @@ Player::kill(bool completely)
     dying_timer.start(3.0);
     set_group(COLGROUP_DISABLED);
 
-    DisplayEffect* effect = new DisplayEffect();
-    effect->fade_out(3.0);
-    Sector::current()->add_object(effect);
+    Sector::current()->effect->fade_out(3.0);
     sound_manager->stop_music(3.0);
   }
 }
@@ -1279,13 +1266,19 @@ Player::move(const Vector& vector)
 void
 Player::check_bounds(Camera* camera)
 {
-  /* Keep tux in bounds: */
+  /* Keep tux in sector bounds: */
   if (get_pos().x < 0) {
-    // Lock Tux to the size of the level, so that he doesn't fall of
-    // on the left side
+    // Lock Tux to the size of the level, so that he doesn't fall off
+    // the left side
     set_pos(Vector(0, get_pos().y));
   }
 
+  if (get_bbox().get_right() > Sector::current()->get_width()) {
+    // Lock Tux to the size of the level, so that he doesn't fall off
+    // the right side
+    set_pos(Vector(Sector::current()->get_width() - get_bbox().get_width(), get_pos().y));
+  }
+
   /* fallen out of the level? */
   if ((get_pos().y > Sector::current()->get_height()) && (!ghost_mode)) {
     kill(true);