fixed bouncing on falling blocks

akatkov7 · Feb 9, 2014 · 351724b · 351724b
1 parent 6eceae5
commit 351724b
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 2 deletions.
diff --git a/bin/AvalancheGame.apk b/bin/AvalancheGame.apk
diff --git a/bin/classes.dex b/bin/classes.dex
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/Player.class b/bin/classes/com/example/avalanchegame/Player.class
diff --git a/src/com/example/avalanchegame/CustomSurfaceView.java b/src/com/example/avalanchegame/CustomSurfaceView.java
@@ -548,6 +548,7 @@ public void restart()
                     * mCanvasHeight);
             topHit = false;
             bottomHit = false;
+            blocksAbovePlayer = 0;
         }
 
         private boolean topHit    = false;
@@ -608,9 +609,9 @@ private void updateLogic()
                 {
                     player.fixIntersection(block, collisionIndicator);
                     // fix grounding within player
+                    player.setYVelocity(block.getVy());
                 }
-                // TODO: is this really supposed to be x?
-                if (player.getX() < block.top)
+                if (player.getY() < block.top)
                     blocksAbovePlayer++;
             }
             if (topHit && bottomHit)

diff --git a/src/com/example/avalanchegame/Player.java b/src/com/example/avalanchegame/Player.java
@@ -401,4 +401,11 @@ public float getX()
     {
         return px;
     }
+
+
+    public void setYVelocity(float blockVY)
+    {
+        // TODO Auto-generated method stub
+        vy = blockVY;
+    }
 }