diff options
author | Timothée Floure | 2016-04-08 11:48:47 +0200 |
---|---|---|
committer | Timothée Floure | 2016-04-08 11:48:47 +0200 |
commit | 22b615543b70fd011f8e5e7ed9d8ae82654e5b0c (patch) | |
tree | 5de5713e8975087dea7d75ccf3cc81e94dc1d615 /src/ch | |
parent | 492ca4fe5b9b193948274419d6361c2829eb10bf (diff) | |
download | xblast-22b615543b70fd011f8e5e7ed9d8ae82654e5b0c.tar.gz |
Fix game duration
Diffstat (limited to 'src/ch')
-rw-r--r-- | src/ch/epfl/xblast/server/GameState.java | 2 | ||||
-rw-r--r-- | src/ch/epfl/xblast/server/Ticks.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ch/epfl/xblast/server/GameState.java b/src/ch/epfl/xblast/server/GameState.java index 4ed1af5..3df5ebd 100644 --- a/src/ch/epfl/xblast/server/GameState.java +++ b/src/ch/epfl/xblast/server/GameState.java | |||
@@ -453,7 +453,7 @@ public final class GameState { | |||
453 | List<Player> players1 = GameState.nextPlayers( | 453 | List<Player> players1 = GameState.nextPlayers( |
454 | this.players, playerBonuses, bombedCells1, board1, blastedCells1, speedChangeEvents); | 454 | this.players, playerBonuses, bombedCells1, board1, blastedCells1, speedChangeEvents); |
455 | 455 | ||
456 | return new GameState(this.ticks, board1, players1, bombs1, explosions1, blasts1); | 456 | return new GameState(this.ticks + 1, board1, players1, bombs1, explosions1, blasts1); |
457 | } | 457 | } |
458 | 458 | ||
459 | /** | 459 | /** |
diff --git a/src/ch/epfl/xblast/server/Ticks.java b/src/ch/epfl/xblast/server/Ticks.java index 3517491..b880dd7 100644 --- a/src/ch/epfl/xblast/server/Ticks.java +++ b/src/ch/epfl/xblast/server/Ticks.java | |||
@@ -53,7 +53,7 @@ public interface Ticks { | |||
53 | /** | 53 | /** |
54 | * Duration of a game (in seconds). | 54 | * Duration of a game (in seconds). |
55 | */ | 55 | */ |
56 | int GAME_DURATION = 2; | 56 | int GAME_DURATION = 120; |
57 | 57 | ||
58 | /** | 58 | /** |
59 | * Total number of ticks during a game. | 59 | * Total number of ticks during a game. |