fixed sinking-rotation, volumeslider; deleted TODO comments
This commit is contained in:
@@ -57,10 +57,8 @@ public void receivedEffect(EffectMessage msg) {
|
||||
|
||||
myTurn = msg.isMyTurn();
|
||||
logic.setInfoText(msg.getInfoTextKey());
|
||||
//TODO: Ex. 13 add shell -> ItemAddedEvent
|
||||
Shell shell = new Shell(msg.getShot());
|
||||
affectedMap(msg).add(shell);
|
||||
//TODO: Ex. 13 Shell sound -> GameSound
|
||||
logic.playSound(Sound.SHELL_FLYING);
|
||||
logic.setState(new ShootingState(logic, shell, myTurn, msg));
|
||||
}
|
||||
|
||||
@@ -26,7 +26,6 @@ public class ShootingState extends ClientState {
|
||||
* @param msg the effect message associated with the shooting action
|
||||
*/
|
||||
public ShootingState(ClientGameLogic logic, Shell shell, boolean myTurn, EffectMessage msg) {
|
||||
//TODO: Ex. 13 ShootingState
|
||||
super(logic);
|
||||
this.msg = msg;
|
||||
this.myTurn = myTurn;
|
||||
|
||||
@@ -221,7 +221,6 @@ private boolean checkMap(List<Battleship> ships) {
|
||||
*/
|
||||
@Override
|
||||
public void received(ShootMessage msg, int from) {
|
||||
//TODO: Ex. 13 Server State
|
||||
if (state != ServerState.BATTLE)
|
||||
LOGGER.log(Level.ERROR, "shoot not allowed in {0}", state); //NON-NLS
|
||||
else{
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
* a Bezier curve.
|
||||
*/
|
||||
public class Shell implements Item {
|
||||
//TODO: Ex. 13 Shell
|
||||
/**
|
||||
* Initial position of the shell
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user