From fa997fb77a784e39c074cb5beb3d77a48f1af3bb Mon Sep 17 00:00:00 2001
From: Administrator <admin@local.host>
Date: Thu, 17 Apr 2014 14:32:25 +0200
Subject: [PATCH] cleanup

---
 {src/mangavalk/tetris => old}/GameMenu.java |  0
 src/mangavalk/tetris/CanvasView.java        | 26 ++++-----------------
 2 files changed, 5 insertions(+), 21 deletions(-)
 rename {src/mangavalk/tetris => old}/GameMenu.java (100%)

diff --git a/src/mangavalk/tetris/GameMenu.java b/old/GameMenu.java
similarity index 100%
rename from src/mangavalk/tetris/GameMenu.java
rename to old/GameMenu.java
diff --git a/src/mangavalk/tetris/CanvasView.java b/src/mangavalk/tetris/CanvasView.java
index a7d7a92..99c1f51 100644
--- a/src/mangavalk/tetris/CanvasView.java
+++ b/src/mangavalk/tetris/CanvasView.java
@@ -13,7 +13,6 @@ public class CanvasView extends View    //  Dev2
     Resources r;
 
     GameStateInterface Foreground = null;
-    GameStateInterface Gamemenu = null;
     GameStateInterface Gameplay = null;
 
     //  Score.
@@ -32,18 +31,15 @@ public class CanvasView extends View    //  Dev2
     public void SetActivity(Activity activity)
     {
         Gameplay = new GamePlay(activity);
-        Gamemenu = new GameMenu(activity);
-
-        Gamemenu.SetCanvas(this);
-        Gamemenu.SetPayedVersion(PayedVersion);
-
-        Gamemenu.Load();
-        Gamemenu.Start();
 
         Gameplay.SetCanvas(this);
         Gameplay.SetPayedVersion(PayedVersion);
 
-        Foreground = Gamemenu;
+        ((GamePlay)Gameplay).SetStartLevel(startLevel);
+        Gameplay.Load();
+        Gameplay.Start();
+
+        Foreground = Gameplay;
     }
 
     @Override
@@ -79,24 +75,12 @@ public class CanvasView extends View    //  Dev2
                 Foreground = Gameplay;
                 break;
             }
-            case GameStateInterface.GS_PAUSED:
-            {
-                Gamemenu.SetGameState(Foreground.GetGameState(), true);
-                Foreground = Gamemenu;
-                break;
-            }
             case GameStateInterface.GS_RESUME:
             {
                 Gameplay.SetGameState(Foreground.GetGameState(), true);
                 Foreground = Gameplay;
                 break;
             }
-            case GameStateInterface.GS_GAMEOVER:
-            {
-                Gamemenu.SetGameState(Foreground.GetGameState(), true);
-                Foreground = Gamemenu;
-                break;
-            }
         }
     }