Add instanceTurret for reduce duplicate code
This commit is contained in:
parent
a8917e577d
commit
a33aba4220
@ -15,6 +15,7 @@ public class GameCanvas extends DoubleBufferedCanvas implements Runnable, Networ
|
|||||||
private final BufferedImage background;
|
private final BufferedImage background;
|
||||||
private Terrain terrain;
|
private Terrain terrain;
|
||||||
private Turret serverTurret, clientTurret;
|
private Turret serverTurret, clientTurret;
|
||||||
|
private Turret instanceTurret;
|
||||||
|
|
||||||
private final boolean serverInstance;
|
private final boolean serverInstance;
|
||||||
private SocketHelper socketHelper;
|
private SocketHelper socketHelper;
|
||||||
@ -109,6 +110,8 @@ public class GameCanvas extends DoubleBufferedCanvas implements Runnable, Networ
|
|||||||
clientTurret = new Turret(Turret.CLIENT, terrain.getLastBlockHeight(), terrain);
|
clientTurret = new Turret(Turret.CLIENT, terrain.getLastBlockHeight(), terrain);
|
||||||
clientTurret.setTurretListener(clientTurretListener);
|
clientTurret.setTurretListener(clientTurretListener);
|
||||||
|
|
||||||
|
instanceTurret = (serverInstance) ? serverTurret : clientTurret;
|
||||||
|
|
||||||
gameStarted = true;
|
gameStarted = true;
|
||||||
serverMove = true;
|
serverMove = true;
|
||||||
}
|
}
|
||||||
@ -120,27 +123,20 @@ public class GameCanvas extends DoubleBufferedCanvas implements Runnable, Networ
|
|||||||
@Override
|
@Override
|
||||||
protected void mousePressed(int x, int y) {
|
protected void mousePressed(int x, int y) {
|
||||||
if (!allowMove()) return;
|
if (!allowMove()) return;
|
||||||
if (serverInstance) serverTurret.setBarrelParams(x, Constants.HEIGHT - y);
|
instanceTurret.setBarrelParams(x, Constants.HEIGHT - y);
|
||||||
else clientTurret.setBarrelParams(x, Constants.HEIGHT - y);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void mouseReleased(int x, int y) {
|
protected void mouseReleased(int x, int y) {
|
||||||
if (!allowMove()) return;
|
if (!allowMove()) return;
|
||||||
if (serverInstance) {
|
socketHelper.sendMove(instanceTurret.getTurretInfo());
|
||||||
socketHelper.sendMove(serverTurret.getTurretInfo());
|
instanceTurret.shoot();
|
||||||
serverTurret.shoot();
|
|
||||||
} else {
|
|
||||||
socketHelper.sendMove(clientTurret.getTurretInfo());
|
|
||||||
clientTurret.shoot();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void mouseDragged(int x, int y) {
|
protected void mouseDragged(int x, int y) {
|
||||||
if (!allowMove()) return;
|
if (!allowMove()) return;
|
||||||
if (serverInstance) serverTurret.setBarrelParams(x, Constants.HEIGHT - y);
|
instanceTurret.setBarrelParams(x, Constants.HEIGHT - y);
|
||||||
else clientTurret.setBarrelParams(x, Constants.HEIGHT - y);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private final Turret.TurretListener serverTurretListener = new Turret.TurretListener() {
|
private final Turret.TurretListener serverTurretListener = new Turret.TurretListener() {
|
||||||
|
Loading…
Reference in New Issue
Block a user