working with Double Hit Balls

game/game_area_interface.h

@@ -12,6 +12,8 @@ public:
     virtual void Draw() { }
     virtual void Update(cardinal) { }
     virtual void OnTapUp(vec2) { }
+    virtual void OnTapUpAfterMove(vec2) { }
+    
     virtual void OnTapDown(vec2) { }
     virtual void OnFling(vec2) { }
 	virtual void OnScroll(vec2) { }

game/main_code.cpp

@@ -11,12 +11,13 @@
 
 #include "main_code.h"
 
-boost::signal<void (vec2)> OnTapUpSignal;
-boost::signal<void (vec2)> OnTapDownSignal;
-boost::signal<void (vec2)> OnFlingSignal;
-boost::signal<void (vec2)> OnScrollSignal;
+boost::signals2::signal<void (vec2)> OnTapUpSignal;
+boost::signals2::signal<void (vec2)> OnTapUpAfterMoveSignal;
+boost::signals2::signal<void (vec2)> OnTapDownSignal;
+boost::signals2::signal<void (vec2)> OnFlingSignal;
+boost::signals2::signal<void (vec2)> OnScrollSignal;
 
-boost::signal<void ()> OnDrawSignal;
+boost::signals2::signal<void ()> OnDrawSignal;
 
 
 const std::string CONST_BLOCK_TEXTURE1 = "block1";
@@ -109,6 +110,9 @@ void TAndroidApplication::InnerDeinit()
     OnTapUpSignal.disconnect(boost::bind(&TGameLevel::OnTapUp, boost::ref(GameLevel), _1));
     OnTapUpSignal.disconnect(boost::bind(&TGameMenu::OnTapUp, boost::ref(Menu), _1));
     
+    OnTapUpAfterMoveSignal.disconnect(boost::bind(&TGameMenu::OnTapUpAfterMove, boost::ref(Menu), _1));
+    
+    
     OnFlingSignal.disconnect(boost::bind(&TGameLevel::OnFling, boost::ref(GameLevel), _1));
     OnFlingSignal.disconnect(boost::bind(&TGameMenu::OnFling, boost::ref(Menu), _1));
     
@@ -136,6 +140,11 @@ void TAndroidApplication::InnerOnTapUp(vec2 p)
 { 
 	OnTapUpSignal(vec2(p.v[0], p.v[1])); 
 }
+
+void TAndroidApplication::InnerOnTapUpAfterMove(vec2 p)
+{
+    OnTapUpAfterMoveSignal(vec2(p.v[0], p.v[1]));
+}
 	
 void TAndroidApplication::InnerOnMove(vec2 shift) 
 {
@@ -151,6 +160,7 @@ void TAndroidApplication::ApplySignalsToMenu()
 {
 
     OnTapUpSignal.connect(boost::bind(&TGameMenu::OnTapUp, boost::ref(Menu), _1));
+    OnTapUpAfterMoveSignal.connect(boost::bind(&TGameMenu::OnTapUpAfterMove, boost::ref(Menu), _1));
     OnFlingSignal.connect(boost::bind(&TGameMenu::OnFling, boost::ref(Menu), _1));
     OnScrollSignal.connect(boost::bind(&TGameMenu::OnScroll, boost::ref(Menu), _1));
     OnTapDownSignal.connect(boost::bind(&TGameMenu::OnTapDown, boost::ref(Menu), _1));
@@ -161,6 +171,7 @@ void TAndroidApplication::ApplySignalsToMenu()
 void TAndroidApplication::DisapplySignalsToMenu()
 {
     OnTapUpSignal.disconnect(boost::bind(&TGameMenu::OnTapUp, boost::ref(Menu), _1));
+    OnTapUpAfterMoveSignal.disconnect(boost::bind(&TGameMenu::OnTapUpAfterMove, boost::ref(Menu), _1));
     OnFlingSignal.disconnect(boost::bind(&TGameMenu::OnFling, boost::ref(Menu), _1));
     OnScrollSignal.disconnect(boost::bind(&TGameMenu::OnScroll, boost::ref(Menu), _1));
     OnTapDownSignal.disconnect(boost::bind(&TGameMenu::OnTapDown, boost::ref(Menu), _1));

game/main_code.h

@@ -22,7 +22,7 @@
 
 #include "include/Engine.h"
 
-#include "boost/signal.hpp"//Signal must be included after asio
+#include "boost/signals2.hpp"//Signal must be included after asio
 
 #include "gamecode.h"
 #include "menucode.h"
@@ -32,12 +32,14 @@
 using namespace SE;
 
 
-extern boost::signal<void (vec2)> OnTapUpSignal;
-extern boost::signal<void (vec2)> OnTapDownSignal;
-extern boost::signal<void (vec2)> OnFlingSignal;
-extern boost::signal<void (vec2)> OnScrollSignal;
+extern boost::signals2::signal<void (vec2)> OnTapUpSignal;
+extern boost::signals2::signal<void (vec2)> OnTapUpAfterMoveSignal;
 
-extern boost::signal<void ()> OnDrawSignal;
+extern boost::signals2::signal<void (vec2)> OnTapDownSignal;
+extern boost::signals2::signal<void (vec2)> OnFlingSignal;
+extern boost::signals2::signal<void (vec2)> OnScrollSignal;
+
+extern boost::signals2::signal<void ()> OnDrawSignal;
 
 extern const std::string CONST_BLOCK_TEXTURE1;
 extern const std::string CONST_BLOCK_TEXTURE2;
@@ -138,6 +140,8 @@ public:
 	virtual void InnerOnTapDown(vec2 p);
 	
 	virtual void InnerOnTapUp(vec2 p);
+    
+    virtual void InnerOnTapUpAfterMove(vec2 p);
 	
 	virtual void InnerOnMove(vec2 shift);
 	

game/menucode.cpp

@@ -133,6 +133,8 @@ void TGameMenu::Update(cardinal dt)
 void TGameMenu::OnTapDown(vec2 pos)
 {
 
+    HoldToTap = true;
+    
     if (pos.v[1]<64.f && pos.v[0]>=265.f-128.f && pos.v[0]<=265.f+128.f)
     {
         Application->GoFromMenuToCredits();
@@ -176,6 +178,11 @@ void TGameMenu::OnTapUp(vec2 pos)
     }
 }
 
+void TGameMenu::OnTapUpAfterMove(vec2 pos)
+{
+    HoldToTap = false;
+}
+
 
 void TGameMenu::OnFling(vec2 slideSpeed)
 {

game/menucode.h

@@ -26,6 +26,7 @@ public:
 	virtual void Update(cardinal dt);
 	virtual void OnTapDown(vec2 pos);
 	virtual void OnTapUp(vec2 pos);
+    virtual void OnTapUpAfterMove(vec2 pos);
 	virtual void OnFling(vec2 slideSpeed);
 	virtual void OnScroll(vec2 shift);