From a33aba422051a471ae669d08030e7336b89972ed Mon Sep 17 00:00:00 2001 From: Victor Date: Sun, 16 Mar 2014 15:43:23 +0200 Subject: [PATCH] Add instanceTurret for reduce duplicate code --- src/com/annimon/turrets/GameCanvas.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/com/annimon/turrets/GameCanvas.java b/src/com/annimon/turrets/GameCanvas.java index bf6164d..b9d3eab 100644 --- a/src/com/annimon/turrets/GameCanvas.java +++ b/src/com/annimon/turrets/GameCanvas.java @@ -15,6 +15,7 @@ public class GameCanvas extends DoubleBufferedCanvas implements Runnable, Networ private final BufferedImage background; private Terrain terrain; private Turret serverTurret, clientTurret; + private Turret instanceTurret; private final boolean serverInstance; private SocketHelper socketHelper; @@ -109,6 +110,8 @@ public class GameCanvas extends DoubleBufferedCanvas implements Runnable, Networ clientTurret = new Turret(Turret.CLIENT, terrain.getLastBlockHeight(), terrain); clientTurret.setTurretListener(clientTurretListener); + instanceTurret = (serverInstance) ? serverTurret : clientTurret; + gameStarted = true; serverMove = true; } @@ -120,27 +123,20 @@ public class GameCanvas extends DoubleBufferedCanvas implements Runnable, Networ @Override protected void mousePressed(int x, int y) { if (!allowMove()) return; - if (serverInstance) serverTurret.setBarrelParams(x, Constants.HEIGHT - y); - else clientTurret.setBarrelParams(x, Constants.HEIGHT - y); + instanceTurret.setBarrelParams(x, Constants.HEIGHT - y); } @Override protected void mouseReleased(int x, int y) { if (!allowMove()) return; - if (serverInstance) { - socketHelper.sendMove(serverTurret.getTurretInfo()); - serverTurret.shoot(); - } else { - socketHelper.sendMove(clientTurret.getTurretInfo()); - clientTurret.shoot(); - } + socketHelper.sendMove(instanceTurret.getTurretInfo()); + instanceTurret.shoot(); } @Override protected void mouseDragged(int x, int y) { if (!allowMove()) return; - if (serverInstance) serverTurret.setBarrelParams(x, Constants.HEIGHT - y); - else clientTurret.setBarrelParams(x, Constants.HEIGHT - y); + instanceTurret.setBarrelParams(x, Constants.HEIGHT - y); } private final Turret.TurretListener serverTurretListener = new Turret.TurretListener() {