From 76fba8f950e3f878e76ed8f2f486eb305c20afa5 Mon Sep 17 00:00:00 2001 From: LMH Date: Mon, 15 Jul 2013 18:10:46 -1000 Subject: [PATCH] Modified conditions in which Tux can release objects. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/object/player.cpp b/src/object/player.cpp index d1e42d8e4..b5bd77d3f 100644 --- a/src/object/player.cpp +++ b/src/object/player.cpp @@ -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); -- 2.11.0