X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlightUI.java;h=63f8c670762794c174946dc27f834dfb151f6906;hp=009ba4adafb3eab42b2c17cd46c93bff3ab2cb16;hb=0d966b74f756e88e5dffa92400b105f540429262;hpb=643c2fb03833d658320f476ef731bbb06fe3cc31

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index 009ba4ad..63f8c670 100644
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -22,8 +22,8 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.util.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altosuilib_11.*;
 
 public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 	AltosVoice		voice;
@@ -40,7 +40,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 	AltosDescent	descent;
 	AltosLanded	landed;
 	AltosCompanionInfo	companion;
-	AltosUIMapNew      sitemap;
+	AltosUIMap      sitemap;
 	boolean		has_map;
 	boolean		has_companion;
 	boolean		has_state;
@@ -53,13 +53,13 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 
 	JComponent cur_tab = null;
 	JComponent which_tab(AltosState state) {
-		if (state.state < Altos.ao_flight_boost)
+		if (state.state() < Altos.ao_flight_boost)
 			return pad;
-		if (state.state <= Altos.ao_flight_coast)
+		if (state.state() <= Altos.ao_flight_coast)
 			return ascent;
-		if (state.state <= Altos.ao_flight_main)
+		if (state.state() <= Altos.ao_flight_main)
 			return descent;
-		if (state.state == AltosLib.ao_flight_stateless)
+		if (state.state() == AltosLib.ao_flight_stateless)
 			return descent;
 		return landed;
 	}
@@ -102,7 +102,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 		if (state == null)
 			state = new AltosState();
 
-		if (state.state != Altos.ao_flight_startup) {
+		if (state.state() != Altos.ao_flight_startup) {
 			if (!has_state) {
 				pane.setTitleAt(0, "Launch Pad");
 				pane.add(ascent, 1);
@@ -289,7 +289,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 		has_companion = false;
 		has_state = false;
 
-		sitemap = new AltosUIMapNew();
+		sitemap = new AltosUIMap();
 		displays.add(sitemap);
 		has_map = false;