ios stuff

jni/creditscode.cpp

@@ -65,7 +65,7 @@ void TGameCredits::Update(cardinal dt)
 
 void TGameCredits::OnTapDown(vec2 p)
 {
-    App->GoFromCreditsToMenu();
+    Application->GoFromCreditsToMenu();
 }
 
 void TGameCredits::StartAppear()

jni/gamecode.cpp

@@ -890,7 +890,7 @@ void TGameLevel::SetPause()
     RenderBufferReady = false;
     LevelState = CONST_LEVELSTATE_GO_TO_PAUSE;
     StateTimer = CONST_PAUSE_APPEAR_TIME;
-    App->MarkSetGameLevelPause();
+    Application->MarkSetGameLevelPause();
 }
 
 void TGameLevel::ReleasePause()
@@ -906,7 +906,7 @@ void TGameLevel::ReleasePause()
     {
         LevelState = CONST_LEVELSTATE_PLAYING;
     }
-    App->MarkReleaseGameLevelPause();
+    Application->MarkReleaseGameLevelPause();
 }
 
 bool TGameLevel::IsPaused()
@@ -1085,8 +1085,8 @@ void TGameLevel::Update(cardinal dt)
     
     if (noMoreBlocks && LevelState != CONST_LEVELSTATE_FINISH_FREEZE)
     {
-        App->OpenNextLevel();
-        App->MarkSetGameLevelPause();
+        Application->OpenNextLevel();
+        Application->MarkSetGameLevelPause();
         SetFinishFreeze();
         CheckGlError();
         
@@ -1538,11 +1538,9 @@ void TGameLevel::OnScroll(vec2 shift)
     else if (LevelState == CONST_LEVELSTATE_PAUSE)
     {
         
-#ifdef TARGET_WIN32
+
 		OutScale += shift.v[1]/320.f;
-#else
-		OutScale -= shift.v[1]/320.f;
-#endif
+
         TryGoToMenu();
     }
 }
@@ -1553,7 +1551,7 @@ void TGameLevel::TryGoToMenu()
     {
         OutScale = 0.5f;
         LevelState = CONST_LEVELSTATE_NODRAW;
-        App->GoFromGameToMenu();
+        Application->GoFromGameToMenu();
     }
     if (OutScale > 1.f)
     {

jni/main_code.cpp

@@ -46,9 +46,13 @@ const std::string CONST_CREDITS_TEXTURE = "credits";
 
 const float CONST_CREDITS_SHOW_TIME = 150.f;
 
+TAndroidApplication* Application;
+
 void TAndroidApplication::InnerInit()
 {
 
+    Application = this;
+    
 #ifdef TARGET_WIN32
 #ifdef NDEBUG
 	ResourceManager->PathToResources = "resources/";

jni/main_code.h

@@ -32,15 +32,9 @@
 using namespace SE;
 
 
-#ifdef TARGET_WIN32
 class TAndroidApplication;
-extern TAndroidApplication* App;
-#endif
+extern TAndroidApplication* Application;
 
-#ifdef TARGET_IOS
-class TAndroidApplication;
-extern TAndroidApplication* App;
-#endif
 
 extern boost::signal<void (vec2)> OnTapUpSignal;
 extern boost::signal<void (vec2)> OnTapDownSignal;
@@ -145,26 +139,14 @@ public:
 	
 	void LoadResources();
 	
-#ifdef TARGET_WIN32
+	virtual void InnerOnTapDown(vec2 p);
+	
+	virtual void InnerOnTapUp(vec2 p);
+	
+	virtual void InnerOnMove(vec2 shift);
+	
+	virtual void OnFling(vec2 v);
 
-	virtual void InnerOnTapDown(vec2 p);
-	
-	virtual void InnerOnTapUp(vec2 p);
-	
-	virtual void InnerOnMove(vec2 shift);
-	
-	virtual void OnFling(vec2 v);
-#endif
-#ifdef TARGET_IOS
-    
-	virtual void InnerOnTapDown(vec2 p);
-	
-	virtual void InnerOnTapUp(vec2 p);
-	
-	virtual void InnerOnMove(vec2 shift);
-	
-	virtual void OnFling(vec2 v);
-#endif
 };
 
 

jni/menucode.cpp

@@ -135,7 +135,7 @@ void TGameMenu::OnTapDown(vec2 pos)
 
     if (pos.v[1]<64.f && pos.v[0]>=265.f-128.f && pos.v[0]<=265.f+128.f)
     {
-        App->GoFromMenuToCredits();
+        Application->GoFromMenuToCredits();
         return;
     }
   
@@ -171,7 +171,7 @@ void TGameMenu::OnTapUp(vec2 pos)
 	if (SelectedGame != -1)
 	{
         MenuPos = -CONST_MENU_WINDOW_DISTANCE*SelectedGame-40.f;
-        App->GoFromMenuToGame(SelectedGame);
+        Application->GoFromMenuToGame(SelectedGame);
         SelectedGame = -1;
     }
 }