started working on pausing

akatkov7 · Feb 26, 2014 · 7e305eb · 7e305eb
1 parent 4fd323b
commit 7e305eb
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 6 deletions.
diff --git a/bin/classes/com/example/avalanchegame/CustomSurfaceView$GameThread.class b/bin/classes/com/example/avalanchegame/CustomSurfaceView$GameThread.class
diff --git a/bin/classes/com/example/avalanchegame/CustomSurfaceView.class b/bin/classes/com/example/avalanchegame/CustomSurfaceView.class
diff --git a/bin/classes/com/example/avalanchegame/MainActivity.class b/bin/classes/com/example/avalanchegame/MainActivity.class
diff --git a/src/com/example/avalanchegame/CustomSurfaceView.java b/src/com/example/avalanchegame/CustomSurfaceView.java
@@ -135,6 +135,8 @@ class GameThread
 
         private final int        MIN_BLOCKS_ABOVE         = 40;
 
+        private boolean          firstTime                = true;
+
 
         // ----------------------------------------------------------
         /**
@@ -310,6 +312,9 @@ public void pause()
             {
                 if (mMode == STATE_RUNNING)
                     setState(STATE_PAUSE);
+
+                mRun = false;
+
             }
         }
 
@@ -516,17 +521,14 @@ public void setSurfaceSize(int width, int height)
          */
         public void unpause()
         {
-            // Move the real time clock up to now
             synchronized (mSurfaceHolder)
             {
+                setState(STATE_RUNNING);
+                mRun = true;
             }
-            setState(STATE_RUNNING);
         }
 
-        boolean firstTime = true;
-
 
-        // TODO: some blocks don't actually get cleared
         public void restart()
         {
             boxes.clear();
@@ -759,6 +761,8 @@ public void onWindowFocusChanged(boolean hasWindowFocus)
     {
         if (!hasWindowFocus)
             thread.pause();
+        else//TODO: make this open pause screen
+            thread.unpause();
     }
 
 
@@ -809,4 +813,5 @@ public void surfaceDestroyed(SurfaceHolder holder)
             }
         }
     }
+
 }
diff --git a/src/com/example/avalanchegame/MainActivity.java b/src/com/example/avalanchegame/MainActivity.java
@@ -1,5 +1,6 @@
 package com.example.avalanchegame;
 
+import android.content.pm.ActivityInfo;
 import android.util.Log;
 import android.app.Activity;
 import android.content.Context;
@@ -36,6 +37,10 @@ protected void onCreate(Bundle savedInstanceState)
         // tell system to use the layout defined in our XML file
         setContentView(R.layout.activity_main);
 
+        // lock in portrait mode? TODO: test this
+        super
+            .setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         SensorManager sensorManager;
         Sensor accelerometer;
@@ -62,8 +67,16 @@ protected void onCreate(Bundle savedInstanceState)
     @Override
     protected void onPause()
     {
-        screenContainer.getThread().pause(); // pause game when Activity pauses
         super.onPause();
+        screenContainer.getThread().pause(); // pause game when Activity pauses
+    }
+
+
+    @Override
+    protected void onResume()
+    {
+        super.onResume();
+        screenContainer.getThread().unpause();// TODO:make this open paused menu
     }