Commit 6c59cd1c authored by Anish Sinha's avatar Anish Sinha
Browse files

merged

parent 15bc322a

app/src/main/java/com/example/a8_bitinvader/GameView.java

+0 −3
Original line number Diff line number Diff line
@@ -84,12 +84,9 @@ public class GameView extends SurfaceView implements Runnable{ 
            Canvas canvas = getHolder().lockCanvas();

            canvas.drawBitmap(background1.background, background1.xPos, background1.yPos, paint);

            canvas.drawBitmap(background2.background, background2.xPos, background2.yPos, paint);

<<<<<<< HEAD

            Player p1 = new Player(getResources());

            canvas.drawBitmap(p1.playerImg, p1.xPos, p1.yPos, paint);

=======

            joystick.draw(canvas);

>>>>>>> Joystick

            getHolder().unlockCanvasAndPost(canvas);

        }

    }