mirror of
https://github.com/2OOP/pism.git
synced 2026-02-04 02:44:50 +00:00
small merge fixes
This commit is contained in:
@@ -6,10 +6,9 @@ public abstract class TurnBasedGame extends Game {
|
||||
protected int currentTurn;
|
||||
|
||||
protected TurnBasedGame(int rowSize, int columnSize, int turns) {
|
||||
assert turns >= 2;
|
||||
|
||||
super(rowSize, columnSize);
|
||||
this.turns = turns;
|
||||
assert turns >= 2;
|
||||
this.turns = turns;
|
||||
}
|
||||
|
||||
protected TurnBasedGame(TurnBasedGame other) {
|
||||
|
||||
Reference in New Issue
Block a user