From 0a1020377b3a3ef832e8a048789db5ce861259db Mon Sep 17 00:00:00 2001
From: Administrator <admin@local.host>
Date: Fri, 21 Feb 2014 13:14:55 +0100
Subject: [PATCH] Load and Start implemented.

---
 src/mangavalk/tetris/CanvasView.java         | 12 +++++++----
 src/mangavalk/tetris/GameMenu.java           | 22 ++++++++++++--------
 src/mangavalk/tetris/GamePlay.java           | 22 +++++++++++++-------
 src/mangavalk/tetris/GameStateInterface.java |  4 ++++
 4 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/src/mangavalk/tetris/CanvasView.java b/src/mangavalk/tetris/CanvasView.java
index 86fd144..1022e3f 100644
--- a/src/mangavalk/tetris/CanvasView.java
+++ b/src/mangavalk/tetris/CanvasView.java
@@ -36,7 +36,9 @@ public class CanvasView extends View    //  Dev2
 
         Gamemenu.SetCanvas(this);
         Gamemenu.SetPayedVersion(PayedVersion);
-        Gamemenu.SetGameState(GamePlay.GS_LOAD, true);
+
+        Gamemenu.Load();
+        Gamemenu.Start();
 
         Gameplay.SetCanvas(this);
         Gameplay.SetPayedVersion(PayedVersion);
@@ -72,15 +74,17 @@ public class CanvasView extends View    //  Dev2
             case GameStateInterface.GS_MENU_START:
             {
                 ((GamePlay)Gameplay).SetStartLevel(startLevel);
-                ((GamePlay)Gameplay).SetGameState(GamePlay.GS_LOAD, true);
+                Gameplay.Load();
+                Gameplay.Start();
+                Foreground = Gameplay;
                 break;
             }
-            case GameStateInterface.GS_READY:
+            /*case GameStateInterface.GS_READY:
             {
                 ((GamePlay)Gameplay).SetGameState(GameStateInterface.GS_START, true);
                 Foreground = Gameplay;
                 break;
-            }
+            }*/
             case GameStateInterface.GS_PAUSED:
             {
                 Gamemenu.SetGameState(Foreground.GetGameState(), true);
diff --git a/src/mangavalk/tetris/GameMenu.java b/src/mangavalk/tetris/GameMenu.java
index 2b4a3ea..88b87e1 100644
--- a/src/mangavalk/tetris/GameMenu.java
+++ b/src/mangavalk/tetris/GameMenu.java
@@ -76,16 +76,16 @@ public class GameMenu extends GameStateInterface
 
         switch(GameState)
         {
-            case GS_LOAD:
+            /*case GS_LOAD:
             {
                 Load();
                 break;
-            }
-            case GS_READY:
+            }*/
+            /*case GS_READY:
             {
                 canvasView.postInvalidate();
                 break;
-            }
+            }*/
             case GS_PAUSED:
             {
                 canvasView.postInvalidate();
@@ -126,11 +126,10 @@ public class GameMenu extends GameStateInterface
     //  Audio.
     MediaPlayer mp;
 
-    //  Load
-    private void Load()
+    // TODO  game state
+    @Override
+    public void Load()
     {
-        SetGameState(GS_LOADING, false);
-
         //  Load Bitmap's.
         //LoadSprites();
 
@@ -140,8 +139,13 @@ public class GameMenu extends GameStateInterface
 
         //  Audio
         mp = MediaPlayer.create(activity, R.raw.tetris_a);
+    }
 
-        SetGameState(GS_MENU_READY, false);
+    @Override
+    public void Start()
+    {
+        GameState = GS_MENU_READY;
+        canvasView.postInvalidate();
     }
 
     //  Draw functions.
diff --git a/src/mangavalk/tetris/GamePlay.java b/src/mangavalk/tetris/GamePlay.java
index c825e85..d8f44b8 100644
--- a/src/mangavalk/tetris/GamePlay.java
+++ b/src/mangavalk/tetris/GamePlay.java
@@ -75,16 +75,16 @@ public class GamePlay extends GameStateInterface
 
         switch(GameState)
         {
-            case GS_LOAD:
+            /*case GS_LOAD:
             {
                 Load();
                 break;
-            }
-            case GS_START:
+            }*/
+            /*case GS_START:
             {
                 StartGame();
                 break;
-            }
+            }*/
             case GS_RESUME:
             {
                 Resume();
@@ -457,9 +457,11 @@ public class GamePlay extends GameStateInterface
         handler.postDelayed(runnable, 100);
     }
 
-    private void Load()
+    // TODO game state
+    @Override
+    public void Load()
     {
-        SetGameState(GS_LOADING, false);
+        //SetGameState(GS_LOADING, false);
 
         //  Load Bitmap's.
         LoadSprites();
@@ -471,7 +473,13 @@ public class GamePlay extends GameStateInterface
         //  Audio
         mp = MediaPlayer.create(activity, R.raw.tetris_a);
 
-        SetGameState(GS_READY, false);
+        //SetGameState(GS_READY, false);
+    }
+
+    @Override
+    public void Start()
+    {
+        StartGame();
     }
 
     private void LoadSprites()
diff --git a/src/mangavalk/tetris/GameStateInterface.java b/src/mangavalk/tetris/GameStateInterface.java
index 00e25b5..76ae3d4 100644
--- a/src/mangavalk/tetris/GameStateInterface.java
+++ b/src/mangavalk/tetris/GameStateInterface.java
@@ -56,6 +56,10 @@ public abstract class GameStateInterface
 
     public abstract void SetGameState(int gameState, boolean isPostBack);
 
+    //  New Game State Methods.
+    public abstract void Load();
+    public abstract void Start();
+
     public abstract void onPause();
 
     //  SetParameters.