Move TurretInfo into Turret class
This commit is contained in:
parent
0a35a03189
commit
46aaa81f9d
@ -1,9 +1,10 @@
|
|||||||
package com.annimon.turrets;
|
package com.annimon.turrets;
|
||||||
|
|
||||||
import com.annimon.turrets.network.SocketHelper;
|
import com.annimon.turrets.Turret.TurretInfo;
|
||||||
import com.annimon.turrets.network.GameServer;
|
|
||||||
import com.annimon.turrets.network.GameClient;
|
import com.annimon.turrets.network.GameClient;
|
||||||
|
import com.annimon.turrets.network.GameServer;
|
||||||
import com.annimon.turrets.network.NetworkListener;
|
import com.annimon.turrets.network.NetworkListener;
|
||||||
|
import com.annimon.turrets.network.SocketHelper;
|
||||||
import com.annimon.turrets.util.Util;
|
import com.annimon.turrets.util.Util;
|
||||||
import java.awt.Color;
|
import java.awt.Color;
|
||||||
import java.awt.Graphics;
|
import java.awt.Graphics;
|
||||||
|
@ -151,4 +151,9 @@ public class Turret implements Constants {
|
|||||||
public interface TurretListener {
|
public interface TurretListener {
|
||||||
void shootComplete(boolean hitOpponent);
|
void shootComplete(boolean hitOpponent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static class TurretInfo {
|
||||||
|
public double barrelAngle, shotPower;
|
||||||
|
public int barrelX, barrelY;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,11 +0,0 @@
|
|||||||
package com.annimon.turrets;
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @author aNNiMON
|
|
||||||
*/
|
|
||||||
public class TurretInfo {
|
|
||||||
|
|
||||||
public double barrelAngle, shotPower;
|
|
||||||
public int barrelX, barrelY;
|
|
||||||
}
|
|
@ -1,6 +1,6 @@
|
|||||||
package com.annimon.turrets.network;
|
package com.annimon.turrets.network;
|
||||||
|
|
||||||
import com.annimon.turrets.TurretInfo;
|
import com.annimon.turrets.Turret.TurretInfo;
|
||||||
import java.io.DataInputStream;
|
import java.io.DataInputStream;
|
||||||
import java.io.DataOutputStream;
|
import java.io.DataOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
Loading…
Reference in New Issue
Block a user