made all jumping much more responsive

akatkov7 · Feb 8, 2014 · 57f5ea0 · 57f5ea0
1 parent 8e1fb5b
commit 57f5ea0
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 11 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
@@ -168,7 +168,6 @@ public void generateBoxes(float startingHeight, float additionalHeight)
                 seededRandom.nextFloat() * mCanvasHeight / 2 + mCanvasHeight
                     / 2)
             {
-                Log.d("ass", spawnHeight + "");
                 int amountPerHeight = seededRandom.nextInt(2) + 1;
                 for (int i = 0; i < amountPerHeight; i++)
                 {
@@ -182,12 +181,10 @@ public void generateBoxes(float startingHeight, float additionalHeight)
                         collisions = false;
                         for (Box block : boxes)
                         {
-                            if (box.intersects(block) > -1)
+                            int temp = box.intersects(block);
+                            if (temp > -1)
                             {
-                                Log.d("lawl", "somehow collided");
-                                x = randInt(0, mCanvasWidth);
-                                collisions = true;
-                                break;
+                                box.fixIntersection(block, temp);
                             }
                         }
                     }
@@ -395,9 +392,6 @@ public void run()
                                     sleepTime += FRAME_PERIOD;
                                     framesSkipped++;
                                 }
-                                Log.d(
-                                    "asdf",
-                                    "thread is actually fucking running");
                             }
                         }
                     }

diff --git a/src/com/example/avalanchegame/Player.java b/src/com/example/avalanchegame/Player.java
@@ -189,7 +189,8 @@ else if (whichSide == 1) // right
             vx = 0;
             if (!midJump)
             {
-                vy = 0;
+                vx = 20.0f;
+                vy = -230.0f;
                 px = playerRect.centerX();
                 canJumpFromRight = true;
             }
@@ -212,7 +213,8 @@ else if (whichSide == 3) // left
             vx = 0;
             if (!midJump)
             {
-                vy = 0;
+                vx = -20.0f;
+                vy = -230.0f;
                 px = playerRect.centerX();
                 canJumpFromLeft = true;
             }