Fixed network game issues.

philliskiragu · May 13, 2014 · 6210661 · 6210661
1 parent bd6c179
commit 6210661
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 8 deletions.
diff --git a/src/org/jfedor/frozenbubble/Compressor.java b/src/org/jfedor/frozenbubble/Compressor.java
@@ -58,14 +58,13 @@
 public class Compressor {
   private BmpWrap compressorHead;
   private BmpWrap compressor;
-  double moveDown;
-  int steps;
+  private double moveDown;
+  private int steps;
 
   public Compressor(BmpWrap compressorHead, BmpWrap compressor) {
     this.compressorHead = compressorHead;
     this.compressor = compressor;
-    this.moveDown = 0.;
-    this.steps = 0;
+    init();
   }
 
   public double getMoveDown() {
@@ -76,6 +75,11 @@ public int getSteps() {
     return steps;
   }
 
+  public void init() {
+    moveDown = 0.;
+    steps = 0;
+  }
+
   public void moveDown() {
     moveDown += 28.;
     steps++;

diff --git a/src/org/jfedor/frozenbubble/FrozenBubble.java b/src/org/jfedor/frozenbubble/FrozenBubble.java
@@ -448,6 +448,7 @@ public synchronized static int getCollision() {
 
   public synchronized static void setCollision(int newCollision) {
     collision = newCollision;
+    BubbleSprite.setCollisionThreshold(collision);
   }
 
   public synchronized static boolean getCompressor() {
@@ -839,6 +840,9 @@ private void playMusic(boolean startPlaying)
     allowUnpause = true;
   }
 
+  /**
+   * Load the game options from the saved shared preferences.
+   */
   private void restoreGamePrefs() {
     SharedPreferences mConfig = getSharedPreferences(PREFS_NAME,
                                                      Context.MODE_PRIVATE);
@@ -853,6 +857,10 @@ private void restoreGamePrefs() {
     soundOn    = mConfig.getBoolean("soundOn",    true                 );
     targetMode = mConfig.getInt    ("targetMode", POINT_TO_SHOOT       );
 
+    /*
+     * Some game options require additional handling to fully implement
+     * changes to game play.
+     */
     BubbleSprite.setCollisionThreshold(collision);
     setTargetModeOrientation();
   }

diff --git a/src/org/jfedor/frozenbubble/FrozenGame.java b/src/org/jfedor/frozenbubble/FrozenGame.java
@@ -365,14 +365,16 @@ private boolean checkLost() {
           lost = true;
         }
       }
-
+
+      int steps = compressor.getSteps();
+
       for (int i = 0; i < 8; i++) {
-        if (bubblePlay[i][12 - compressor.steps] != null) {
+        if (bubblePlay[i][12 - steps] != null) {
           lost = true;
           break;
         }
       }
-  
+
       if (lost) {
         penguin.updateState(PenguinSprite.STATE_GAME_LOST);
         if (highscoreManager != null)
@@ -459,7 +461,7 @@ public int getAttackBarBubbles() {
   }
 
   public int getCompressorSteps() {
-    return compressor.steps;
+    return compressor.getSteps();
   }
 
   public int getCurrentColor() {
@@ -1306,6 +1308,11 @@ public void setGrid(byte[][] newGrid) {
         }
       }
     }
+    int steps = compressor.getSteps();
+    compressor.init();
+    for (int index = 0; index < steps; index++) {
+      lowerCompressor(false);
+    }
   }
 
   public void setLaunchBubbleColors(int current, int next, int newNext) {