From ce5cd45751145ae967ba5491313b6edd952523a4 Mon Sep 17 00:00:00 2001 From: Daniela Ferraz Date: Wed, 3 Jul 2013 12:03:15 -1000 Subject: [PATCH] Owl releases payload just prior to leaving the sector bounds, fixes bug 877 --- src/badguy/owl.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/badguy/owl.cpp b/src/badguy/owl.cpp index db8b2fe7c..20886d484 100644 --- a/src/badguy/owl.cpp +++ b/src/badguy/owl.cpp @@ -104,8 +104,15 @@ Owl::active_update (float elapsed_time) obj_pos.x -= 16.0; /* FIXME: Actually do use the half width of the carried object here. */ obj_pos.y += 3.0; /* Move a little away from the hitbox (the body). Looks nicer. */ - carried_object->grab (*this, obj_pos, dir); + //To drop enemie before leave the screen + if (obj_pos.x<=16 || obj_pos.x+16>=Sector::current()->get_width()){ + carried_object->ungrab (*this, dir); + carried_object = NULL; + } + else + carried_object->grab (*this, obj_pos, dir); } + else { /* if (is_above_player) */ carried_object->ungrab (*this, dir); carried_object = NULL; -- 2.11.0