Remove TurretListener from shoot method
This commit is contained in:
parent
63f76b6151
commit
a8917e577d
@ -58,7 +58,7 @@ public class GameCanvas extends DoubleBufferedCanvas implements Runnable, Networ
|
|||||||
break;
|
break;
|
||||||
case ON_MOVE_RECEIVED:
|
case ON_MOVE_RECEIVED:
|
||||||
clientTurret.setTurretInfo((TurretInfo) data);
|
clientTurret.setTurretInfo((TurretInfo) data);
|
||||||
clientTurret.shoot(clientTurretListener);
|
clientTurret.shoot();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -70,7 +70,7 @@ public class GameCanvas extends DoubleBufferedCanvas implements Runnable, Networ
|
|||||||
break;
|
break;
|
||||||
case ON_MOVE_RECEIVED:
|
case ON_MOVE_RECEIVED:
|
||||||
serverTurret.setTurretInfo((TurretInfo) data);
|
serverTurret.setTurretInfo((TurretInfo) data);
|
||||||
serverTurret.shoot(serverTurretListener);
|
serverTurret.shoot();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -105,7 +105,9 @@ public class GameCanvas extends DoubleBufferedCanvas implements Runnable, Networ
|
|||||||
terrain.generate(seed);
|
terrain.generate(seed);
|
||||||
|
|
||||||
serverTurret = new Turret(Turret.SERVER, terrain.getFirstBlockHeight(), terrain);
|
serverTurret = new Turret(Turret.SERVER, terrain.getFirstBlockHeight(), terrain);
|
||||||
|
serverTurret.setTurretListener(serverTurretListener);
|
||||||
clientTurret = new Turret(Turret.CLIENT, terrain.getLastBlockHeight(), terrain);
|
clientTurret = new Turret(Turret.CLIENT, terrain.getLastBlockHeight(), terrain);
|
||||||
|
clientTurret.setTurretListener(clientTurretListener);
|
||||||
|
|
||||||
gameStarted = true;
|
gameStarted = true;
|
||||||
serverMove = true;
|
serverMove = true;
|
||||||
@ -127,10 +129,10 @@ public class GameCanvas extends DoubleBufferedCanvas implements Runnable, Networ
|
|||||||
if (!allowMove()) return;
|
if (!allowMove()) return;
|
||||||
if (serverInstance) {
|
if (serverInstance) {
|
||||||
socketHelper.sendMove(serverTurret.getTurretInfo());
|
socketHelper.sendMove(serverTurret.getTurretInfo());
|
||||||
serverTurret.shoot(serverTurretListener);
|
serverTurret.shoot();
|
||||||
} else {
|
} else {
|
||||||
socketHelper.sendMove(clientTurret.getTurretInfo());
|
socketHelper.sendMove(clientTurret.getTurretInfo());
|
||||||
clientTurret.shoot(clientTurretListener);
|
clientTurret.shoot();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -141,7 +143,7 @@ public class GameCanvas extends DoubleBufferedCanvas implements Runnable, Networ
|
|||||||
else clientTurret.setBarrelParams(x, Constants.HEIGHT - y);
|
else clientTurret.setBarrelParams(x, Constants.HEIGHT - y);
|
||||||
}
|
}
|
||||||
|
|
||||||
private Turret.TurretListener serverTurretListener = new Turret.TurretListener() {
|
private final Turret.TurretListener serverTurretListener = new Turret.TurretListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void shootComplete(int x) {
|
public void shootComplete(int x) {
|
||||||
@ -149,7 +151,7 @@ public class GameCanvas extends DoubleBufferedCanvas implements Runnable, Networ
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
private Turret.TurretListener clientTurretListener = new Turret.TurretListener() {
|
private final Turret.TurretListener clientTurretListener = new Turret.TurretListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void shootComplete(int x) {
|
public void shootComplete(int x) {
|
||||||
|
@ -43,6 +43,10 @@ public class Turret implements Constants {
|
|||||||
calculateBarrelPosition();
|
calculateBarrelPosition();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setTurretListener(TurretListener listener) {
|
||||||
|
this.listener = listener;
|
||||||
|
}
|
||||||
|
|
||||||
public void draw(Graphics2D g) {
|
public void draw(Graphics2D g) {
|
||||||
g.setColor(Color.WHITE);
|
g.setColor(Color.WHITE);
|
||||||
g.drawLine(turretX, Constants.HEIGHT - turretY, barrelX, Constants.HEIGHT - barrelY);
|
g.drawLine(turretX, Constants.HEIGHT - turretY, barrelX, Constants.HEIGHT - barrelY);
|
||||||
@ -115,10 +119,9 @@ public class Turret implements Constants {
|
|||||||
this.barrelY = t.barrelY;
|
this.barrelY = t.barrelY;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void shoot(TurretListener listener) {
|
public void shoot() {
|
||||||
if (shootState) return;
|
if (shootState) return;
|
||||||
|
|
||||||
this.listener = listener;
|
|
||||||
shootState = true;
|
shootState = true;
|
||||||
shootInfo.reset();
|
shootInfo.reset();
|
||||||
shootInfo.x = barrelX;
|
shootInfo.x = barrelX;
|
||||||
|
Loading…
Reference in New Issue
Block a user