Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13

2026-05-09 06:18:44 +00:00 · 2017-03-08 14:20:38 +13:00
parent 05a2c441b3 0ab2e7881f
commit 0efb18b04d
3 changed files with 9 additions and 8 deletions
@@ -20,7 +20,7 @@ public class App
 		int numberOfBoats = (int) fp.getRaceSize();

 		//get time scale
-		int timeScale = (int) fp.getTimeScale();
+		double timeScale = fp.getTimeScale();
 		race.setTimeScale(timeScale);

 		for (Map<String, Object> team : teams) {