Tux will not drop an object when releasing Action button on touchscreen

Holding the Action button on a phone makes it impossible to press the Jump button
Also prevents Tux from blasting a stunned Mr. Ice Block with a fireball when trying to pick him up
Using keyboard or gamepad will behave the same way as before, releasing Action button will drop the object

Author: pelya

src/control/controller.cpp

@@ -66,7 +66,8 @@ boost::optional<Control> Control_from_string(const std::string& text)
   return boost::none;
 }
 
-Controller::Controller()
+Controller::Controller():
+  m_touchscreen(false)
 {
   reset();
 }
@@ -81,6 +82,7 @@ Controller::reset()
     m_controls[i] = false;
     m_old_controls[i] = false;
   }
+  m_touchscreen = false;
 }
 
 void
@@ -89,6 +91,12 @@ Controller::set_control(Control control, bool value)
   m_controls[static_cast<int>(control)] = value;
 }
 
+void
+Controller::set_touchscreen(bool value)
+{
+  m_touchscreen = value;
+}
+
 bool
 Controller::hold(Control control) const
 {
@@ -107,6 +115,12 @@ Controller::released(Control control) const
   return m_old_controls[static_cast<int>(control)] && !m_controls[static_cast<int>(control)];
 }
 
+bool
+Controller::is_touchscreen() const
+{
+  return m_touchscreen;
+}
+
 void
 Controller::update()
 {

src/control/controller.hpp

@@ -63,6 +63,9 @@ class Controller
 
   void set_control(Control control, bool value);
 
+  /** Touchscreen flag is set by MobileController, cleared when starting the level */
+  void set_touchscreen(bool value);
+
   /** returns true if the control is pressed down */
   bool hold(Control control) const;
 
@@ -74,13 +77,19 @@ class Controller
 
   void reset();
 
+  /** returns true if the controller event has been generated by touchscreen */
+  bool is_touchscreen() const;
+
 protected:
   /** current control status */
   bool m_controls[static_cast<int>(Control::CONTROLCOUNT)];
 
   /** control status at last frame */
   bool m_old_controls[static_cast<int>(Control::CONTROLCOUNT)];
 
+  /** the event has been generated by touchscreen */
+  bool m_touchscreen;
+
 private:
   Controller(const Controller&) = delete;
   Controller& operator=(const Controller&) = delete;

src/control/mobile_controller.cpp

@@ -212,6 +212,11 @@ MobileController::apply(Controller& controller) const
     controller.set_control(Control::DEBUG_MENU, m_debug);
   if (m_escape != m_old_escape)
     controller.set_control(Control::ESCAPE, m_escape);
+
+  if (m_up || m_down || m_left || m_right || m_jump || m_action || m_cheats || m_debug || m_escape)
+  {
+    controller.set_touchscreen(true);
+  }
 }
 
 bool

src/object/player.cpp

@@ -189,6 +189,7 @@ Player::Player(PlayerStatus& player_status, const std::string& name_) :
   m_visible(true),
   m_grabbed_object(nullptr),
   m_grabbed_object_remove_listener(new GrabListener(*this)),
+  m_released_object(false),
   // if/when we have complete penny gfx, we can
   // load those instead of Tux's sprite in the
   // constructor
@@ -1135,9 +1136,12 @@ Player::handle_input()
   /* Handle vertical movement: */
   if (!m_stone && !m_swimming) handle_vertical_input();
 
+  /* grabbing */
+  bool just_grabbed = try_grab();
+
   /* Shoot! */
   auto active_bullets = Sector::get().get_object_count<Bullet>();
-  if (m_controller->pressed(Control::ACTION) && (m_player_status.bonus == FIRE_BONUS || m_player_status.bonus == ICE_BONUS)) {
+  if (m_controller->pressed(Control::ACTION) && (m_player_status.bonus == FIRE_BONUS || m_player_status.bonus == ICE_BONUS) && !m_grabbed_object) {
     if ((m_player_status.bonus == FIRE_BONUS &&
       active_bullets < m_player_status.max_fire_bullets) ||
       (m_player_status.bonus == ICE_BONUS &&
@@ -1200,10 +1204,9 @@ Player::handle_input()
     do_standup(false);
   }
 
-  /* grabbing */
-  try_grab();
-
-  if (!m_controller->hold(Control::ACTION) && m_grabbed_object) {
+  /* Drop grabbed object when releasing the Action button on keyboard or gamepad, and on the second button press when using touchscreen */
+  if ((m_controller->is_touchscreen() ? m_controller->pressed(Control::ACTION) : !m_controller->hold(Control::ACTION)) &&
+      m_grabbed_object && !just_grabbed) {
     auto moving_object = dynamic_cast<MovingObject*> (m_grabbed_object);
     if (moving_object) {
       // move the grabbed object a bit away from tux
@@ -1256,12 +1259,17 @@ Player::handle_input()
         }
         moving_object->del_remove_listener(m_grabbed_object_remove_listener.get());
         m_grabbed_object = nullptr;
+        m_released_object = true;
       }
     } else {
       log_debug << "Non MovingObject grabbed?!?" << std::endl;
     }
   }
 
+  if (!m_controller->hold(Control::ACTION) && m_released_object) {
+    m_released_object = false;
+  }
+
   /* stop backflipping at will */
   if ( m_backflipping && ( !m_controller->hold(Control::JUMP) && !m_backflip_timer.started()) ){
     stop_backflipping();
@@ -1293,10 +1301,10 @@ Player::position_grabbed_object()
   }
 }
 
-void
+bool
 Player::try_grab()
 {
-  if (m_controller->hold(Control::ACTION) && !m_grabbed_object && !m_duck)
+  if (m_controller->hold(Control::ACTION) && !m_grabbed_object && !m_duck && !m_released_object)
   {
 
     Vector pos(0.0f, 0.0f);
@@ -1335,11 +1343,12 @@ Player::try_grab()
           moving_object.add_remove_listener(m_grabbed_object_remove_listener.get());
 
           position_grabbed_object();
-          break;
+          return true;
         }
       }
     }
   }
+  return false;
 }
 
 void

src/object/player.hpp

@@ -216,7 +216,7 @@ class Player final : public MovingObject,
   void stop_backflipping();
 
   void position_grabbed_object();
-  void try_grab();
+  bool try_grab();
 
   /** Boosts Tux in a certain direction, sideways. Useful for bumpers/walljumping. */
   void sideways_push(float delta);
@@ -326,6 +326,7 @@ class Player final : public MovingObject,
 
   Portable* m_grabbed_object;
   std::unique_ptr<ObjectRemoveListener> m_grabbed_object_remove_listener;
+  bool m_released_object;
 
   SpritePtr m_sprite; /**< The main sprite representing Tux */