michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some bugs

Browse Source 
/#pair[hyi25, mra106]
This commit is contained in:
Haoming Yin
2017-03-08 13:31:44 +13:00
parent 88167773dd
commit 2b464d16f9
4 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/Race.java
+10 -2
View File
@@ -135,6 +135,14 @@ public class Race {
return this.legs;
}
/**
* Sets time scale
* @param timeScale
*/
public void setTimeScale(int timeScale) {
this.timeScale = timeScale;
}
/**
* Temporary method used to generated all the events.
*/
@@ -144,7 +152,7 @@ public class Race {
for (Boat boat : this.boats) {
long totalDistance = 0;
for (Leg leg : this.legs) {
long time = (long) (1000 * totalDistance / (boat.getVelocity() * this.timeScale));
long time = (long) (1000 * totalDistance / boat.getVelocity());
Event event = new Event(time, boat, leg);
events.add(event);
totalDistance += leg.getDistance();
@@ -173,7 +181,7 @@ public class Race {
// iterates all events. ends when no event in events.
while (!events.isEmpty()) {
Event peekEvent = events.peek();
long currentTime = System.currentTimeMillis() - this.startTime;
long currentTime = (System.currentTimeMillis() - this.startTime) * this.timeScale;
if (currentTime > peekEvent.getTime()) {
// pull out the event