Commit ed9e6a5d authored by Thomas Poimenidis's avatar Thomas Poimenidis
Browse files

resolved conflict w/ enemy and sprite

parent 58435111

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

+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ public class Enemy extends Sprite{ 


    //initialize the Xval,Yval. and inital position

    public Enemy(int PosX, int PosY, int theXVal, int theYVal, int img ) {

        super(PosX,PosY,img);

        super(PosX,PosY);

        XVal = theXVal;

        YVal = theYVal;

    }
@@ -13,8 +13,8 @@ public class Enemy extends Sprite{ 
    //this updates the location of the sprite

    @Override

    public void updateLocation(){

        x += XVal;

        y += YVal;

        xPos += XVal;

        yPos += YVal;

    }