Merged dev changes back on to mini map

#story[1273]
This commit is contained in:
William Muir
2017-09-28 14:44:16 +13:00
parent a5eea10c87
commit c98297ea79
@@ -238,7 +238,7 @@ public class GameState implements Runnable {
if (System.currentTimeMillis() > startTime) { if (System.currentTimeMillis() > startTime) {
startSpawningTokens(); startSpawningTokens();
startUpdatingWind(); startUpdatingWind();
GameState.setCurrentStage(GameStages.RACING); GameState.currentStage = GameStages.RACING;
} }
} }
if (currentStage == GameStages.RACING) { if (currentStage == GameStages.RACING) {
@@ -299,8 +299,8 @@ public class GameState implements Runnable {
windSpeed += random.nextInt(500); windSpeed += random.nextInt(500);
} }
GameState.setWindSpeed(Double.valueOf(windSpeed)); GameState.windSpeed = Double.valueOf(windSpeed);
GameState.setWindDirection(direction.doubleValue()); GameState.windDirection = direction.doubleValue();
} }