reverted changes to the Scroll/OnScroll method signatures.

JGE/include/JApp.h

@@ -83,7 +83,7 @@ public:
 	//////////////////////////////////////////////////////////////////////////
 	virtual void Resume() = 0;
 
-    virtual void OnScroll(int inXVelocity, int inYVelocity, int magnitude = 0) = 0;
+    virtual void OnScroll(int inXVelocity, int inYVelocity) = 0;
 };
 
 

JGE/include/JGE.h

@@ -331,7 +331,7 @@ class JGE
 
 
   // Scroll events - currently triggered by SDL JOYBALL events
-  void Scroll(int inXVelocity, int inYVelocity, int magnitude);
+  void Scroll(int inXVelocity, int inYVelocity);
 
   //////////////////////////////////////////////////////////////////////////
   /// Get if the system is ended/paused or not.

JGE/src/JGE.cpp

@@ -577,11 +577,11 @@ void JGE::Assert(const char *filename, long lineNumber)
     mCriticalAssert = true;
 }
 
-void JGE::Scroll(int inXVelocity, int inYVelocity, int magnitude)
+void JGE::Scroll(int inXVelocity, int inYVelocity)
 {
     if (mApp != NULL)
     {
-        mApp->OnScroll(inXVelocity, inYVelocity, magnitude);
+        mApp->OnScroll(inXVelocity, inYVelocity);
     }
 }
 

JGE/src/iOS/EAGLView.m

@@ -419,8 +419,7 @@ static NSString *_MY_AD_WHIRL_APPLICATION_KEY_IPAD = @"2e70e3f3da40408588b9a3170
         else 
         {   
             CGPoint v2 = [panGesture velocityInView: self];            
-            int magnitude = [self distanceBetweenPointA: currentLocation andPointB: v2];
+            g_engine->Scroll( 0 - static_cast<int>(v2.x), 0 - static_cast<int>(v2.y));
-            g_engine->Scroll( 0 - static_cast<int>(v2.x), 0 - static_cast<int>(v2.y), static_cast<int>(magnitude));
             [self performSelector: @selector(resetInput) withObject: nil afterDelay: 0.5];
 
         }

projects/mtg/Android/default.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-9
+target=android-10

projects/mtg/include/GameApp.h

@@ -80,7 +80,7 @@ public:
     virtual void Pause();
     virtual void Resume();
 
-    virtual void OnScroll(int inXVelocity, int inYVelocity, int magnitude = 0);
+    virtual void OnScroll(int inXVelocity, int inYVelocity);
 
     void LoadGameStates();
     void SetNextState(int state);

projects/mtg/include/GameState.h

@@ -56,7 +56,7 @@ public:
     virtual void Start(){}
     virtual void End(){}
 
-    virtual void OnScroll(int inXVelocity, int inYVelocity, int magnitude = 0)
+    virtual void OnScroll(int inXVelocity, int inYVelocity)
     {
     }
 

projects/mtg/include/GameStateAwards.h

@@ -35,7 +35,7 @@ public:
     virtual void Update(float dt);
     virtual void Render();
     virtual void ButtonPressed(int controllerId, int controlId);
-    virtual void OnScroll(int inXVelocity, int inYVelocity, int magnitude = 0);
+    virtual void OnScroll(int inXVelocity, int inYVelocity);
 };
 
 #endif

projects/mtg/include/GameStateDeckViewer.h

@@ -150,7 +150,7 @@ public:
     int loadDeck(int deckid);
     void LoadDeckStatistics(int deckId);
 
-    void OnScroll(int inXVelocity, int inYVelocity, int magnitude = 0);
+    void OnScroll(int inXVelocity, int inYVelocity);
 
     void buildEditorMenu();
     virtual void ButtonPressed(int controllerId, int controlId);

projects/mtg/include/GameStateDuel.h

@@ -80,7 +80,7 @@ public:
     virtual void Render();
     void initRand(unsigned seed = 0);
 
-    void OnScroll(int inXVelocity, int inYVelocity, int magnitude = 0);
+    void OnScroll(int inXVelocity, int inYVelocity);
 
     enum ENUM_DUEL_STATE_MENU_ITEM
     {

projects/mtg/include/GameStateShop.h

@@ -115,7 +115,7 @@ public:
     virtual void Update(float dt);
     virtual void Render();
     virtual void ButtonPressed(int controllerId, int controlId);
-    virtual void OnScroll(int inXVelocity, int inYVelocity, int magnitude = 0);
+    virtual void OnScroll(int inXVelocity, int inYVelocity);
     static float _x1[], _y1[], _x2[], _y2[], _x3[], _y3[], _x4[], _y4[];
 };
 

projects/mtg/src/GameApp.cpp

@@ -445,11 +445,11 @@ void GameApp::Render()
 
 }
 
-void GameApp::OnScroll(int inXVelocity, int inYVelocity, int magnitude)
+void GameApp::OnScroll(int inXVelocity, int inYVelocity)
 {
     if (mCurrentState != NULL)
     {
-        mCurrentState->OnScroll(inXVelocity, inYVelocity, magnitude);
+        mCurrentState->OnScroll(inXVelocity, inYVelocity);
     }
 }
 

projects/mtg/src/GameStateAwards.cpp

@@ -389,7 +389,7 @@ void GameStateAwards::ButtonPressed(int controllerId, int controlId)
     }
 }
 
-void GameStateAwards::OnScroll(int inXVelocity, int inYVelocity, int magnitude)
+void GameStateAwards::OnScroll(int inXVelocity, int inYVelocity)
 {
     if (abs(inYVelocity) > 300)
     {

projects/mtg/src/GameStateDeckViewer.cpp

@@ -1734,8 +1734,10 @@ void GameStateDeckViewer::ButtonPressed(int controllerId, int controlId)
     }
 }
 
-void GameStateDeckViewer::OnScroll(int inXVelocity, int inYVelocity, int magnitude)
+void GameStateDeckViewer::OnScroll(int inXVelocity, int inYVelocity)
 {
+    int magnitude = static_cast<int>( sqrtf( (float )( (inXVelocity * inXVelocity) + (inXVelocity * inXVelocity))));
+    
     bool flickHorizontal = (abs(inXVelocity) > abs(inYVelocity));
     bool flickUp = !flickHorizontal && (inYVelocity < 0) ? true : false;
     bool flickRight = flickHorizontal && (inXVelocity > 0) ? true : false;

projects/mtg/src/GameStateDuel.cpp

@@ -931,7 +931,7 @@ void GameStateDuel::ButtonPressed(int controllerId, int controlId)
     }
 }
 
-void GameStateDuel::OnScroll(int inXVelocity, int inYVelocity, int magnitude)
+void GameStateDuel::OnScroll(int inXVelocity, int inYVelocity)
 {
     // ignore magnitude for now, since no action requires scrolling
     if (abs(inYVelocity) > 300)

projects/mtg/src/GameStateShop.cpp

@@ -808,7 +808,7 @@ void GameStateShop::ButtonPressed(int controllerId, int controlId)
     menu->Close();
 }
 
-void GameStateShop::OnScroll(int inXVelocity, int inYVelocity, int magnitude)
+void GameStateShop::OnScroll(int inXVelocity, int inYVelocity)
 {
     // we ignore magnitude since there isn't any scrolling in the shop
     if (abs(inXVelocity) > 200)