summaryrefslogtreecommitdiff
path: root/altoslib/AltosFlightStats.java
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2016-01-10 19:09:09 -0700
committerBdale Garbee <bdale@gag.com>2016-01-10 19:09:09 -0700
commit4ecc53175a5c28cbc1b846c24d83b6adc3afc2ef (patch)
tree4c318f3d5b7ef01247531a8ccb8ce3ce211e48b3 /altoslib/AltosFlightStats.java
parent19d25c9f4c80d2c8562fc4abd766a23961167e79 (diff)
parenta2ea621eac3263348aff50885c79296f8ece26ed (diff)
Merge branch 'branch-1.6' into debian
Diffstat (limited to 'altoslib/AltosFlightStats.java')
-rw-r--r--altoslib/AltosFlightStats.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/altoslib/AltosFlightStats.java b/altoslib/AltosFlightStats.java
index b837ba84..39e8cdae 100644
--- a/altoslib/AltosFlightStats.java
+++ b/altoslib/AltosFlightStats.java
@@ -15,7 +15,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_8;
+package org.altusmetrum.altoslib_9;
import java.io.*;
@@ -52,7 +52,7 @@ public class AltosFlightStats {
for (AltosState s : states) {
state = s;
- if (state.state == AltosLib.ao_flight_landed)
+ if (state.state() == AltosLib.ao_flight_landed)
break;
}
@@ -92,7 +92,7 @@ public class AltosFlightStats {
state = s;
if (state.acceleration() < 1)
boost_time = state.time;
- if (state.state >= AltosLib.ao_flight_boost && state.state <= AltosLib.ao_flight_landed)
+ if (state.state() >= AltosLib.ao_flight_boost && state.state() <= AltosLib.ao_flight_landed)
break;
}
if (state == null)
@@ -138,7 +138,7 @@ public class AltosFlightStats {
if (state.pressure() != AltosLib.MISSING)
has_flight_data = true;
- int state_id = state.state;
+ int state_id = state.state();
if (state.time >= boost_time && state_id < AltosLib.ao_flight_boost)
state_id = AltosLib.ao_flight_boost;
if (state.time >= landed_time && state_id < AltosLib.ao_flight_landed)