Modified conditions in which Tux can release objects.
authorLMH <lmh.0013@gmail.com>
Tue, 16 Jul 2013 04:10:46 +0000 (18:10 -1000)
committerLMH <lmh.0013@gmail.com>
Tue, 16 Jul 2013 04:10:46 +0000 (18:10 -1000)
Allow Tux to ungrab in close proximity to other objects and while under/in front of unisolid tiles.  This resolves bug 847.

src/object/player.cpp

index d1e42d8..b5bd77d 100644 (file)
@@ -816,7 +816,7 @@ Player::handle_input()
         dest.p1.x = bbox.get_right() + 1;
         dest.p2.x = dest.p1.x + grabbed_bbox.get_width();
       }
-      if(Sector::current()->is_free_of_movingstatics(dest)) {
+      if(Sector::current()->is_free_of_tiles(dest, true)) {
         moving_object->set_pos(dest.p1);
         if(controller->hold(Controller::UP)) {
           grabbed_object->ungrab(*this, UP);