From 69cdce951c5ed1a130296b4ef88b692f03504eea Mon Sep 17 00:00:00 2001
From: legoboyvdlp R <legoboyvdlp@gmail.com>
Date: Fri, 10 Jul 2020 21:28:53 +0100
Subject: [PATCH] Bugfixes

---
 Models/Instruments/MCDU/MCDU.nas | 6 ++----
 Nasal/FMGC/FMGC.nas              | 2 +-
 Nasal/MCDU/F-PLN.nas             | 2 +-
 Nasal/MCDU/INITA.nas             | 1 +
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Models/Instruments/MCDU/MCDU.nas b/Models/Instruments/MCDU/MCDU.nas
index 86011e9d..a35cd073 100644
--- a/Models/Instruments/MCDU/MCDU.nas
+++ b/Models/Instruments/MCDU/MCDU.nas
@@ -101,8 +101,6 @@ var vor1CRS = props.globals.getNode("/instrumentation/nav[2]/radials/selected-de
 var vor2CRS = props.globals.getNode("/instrumentation/nav[3]/radials/selected-deg", 1);
 
 # INT-A
-var depArpt = props.globals.getNode("/FMGC/internal/dep-arpt", 1);
-var arrArpt = props.globals.getNode("/FMGC/internal/arr-arpt", 1);
 var ADIRSMCDUBTN = props.globals.getNode("/controls/adirs/mcducbtn", 1);
 
 # IRSINIT variables
@@ -2282,7 +2280,7 @@ var canvas_MCDU_base = {
 			me["Simple_R5S"].setText("ENG OUT ACC");
 			me["Simple_R6S"].setText("NEXT ");
 			
-			if (fmgc.FMGCInternal.transcrzSet) {
+			if (fmgc.FMGCInternal.transAltSet) {
 				me["Simple_L4"].setFontSize(normal);
 			} else {
 				me["Simple_L4"].setFontSize(small);
@@ -2967,7 +2965,7 @@ var canvas_MCDU_base = {
 			me["Simple_L4S"].setText("TRANS FL");
 			me["Simple_L4"].setText("FL" ~ sprintf("%2.0f", (fmgc.FMGCInternal.transAlt / 100)));
 			
-			if (fmgc.FMGCInternal.transcrzSet) {
+			if (fmgc.FMGCInternal.transAltSet) {
 				me["Simple_L4"].setFontSize(normal);
 			} else {
 				me["Simple_L4"].setFontSize(small);
diff --git a/Nasal/FMGC/FMGC.nas b/Nasal/FMGC/FMGC.nas
index f59057ad..87d34381 100644
--- a/Nasal/FMGC/FMGC.nas
+++ b/Nasal/FMGC/FMGC.nas
@@ -716,7 +716,7 @@ var masterFMGC = maketimer(0.2, func {
 	departure_rwy = fmgc.flightPlanController.flightplans[2].departure_runway;
 	destination_rwy = fmgc.flightPlanController.flightplans[2].destination_runway;
 	if (destination_rwy != nil and phase >= 2) {
-		var airport = airportinfo(getprop("/FMGC/internal/arr-arpt"));
+		var airport = airportinfo(fmgc.FMGCInternal.arrApt);
 		setprop("/FMGC/internal/ldg-elev", airport.elevation * M2FT); # eventually should be runway elevation
 		magnetic_hdg = geo.normdeg(destination_rwy.heading - getprop("/environment/magnetic-variation-deg"));
 		runway_ils = destination_rwy.ils_frequency_mhz;
diff --git a/Nasal/MCDU/F-PLN.nas b/Nasal/MCDU/F-PLN.nas
index 356c292a..324d0035 100644
--- a/Nasal/MCDU/F-PLN.nas
+++ b/Nasal/MCDU/F-PLN.nas
@@ -103,7 +103,7 @@ var fplnItem = {
 		}
 	},
 	getAlt: func() {
-		if (me.index == 0 and left(me.wp.wp_name, 4) == getprop("/FMGC/internal/dep-arpt") and fmgc.flightPlanController.flightplans[me.plan].departure != nil) {
+		if (me.index == 0 and left(me.wp.wp_name, 4) == fmgc.FMGCInternal.depApt and fmgc.flightPlanController.flightplans[me.plan].departure != nil) {
 			return [" " ~ sprintf("%-5.0f", math.round(fmgc.flightPlanController.flightplans[me.plan].departure.elevation * M2FT)), "mag"];
 		} elsif (me.index == (fmgc.flightPlanController.currentToWptIndex.getValue() - 1) and fmgc.flightPlanController.fromWptAlt != nil) {
 			return [" " ~ fmgc.flightPlanController.fromWptAlt, "mag"];
diff --git a/Nasal/MCDU/INITA.nas b/Nasal/MCDU/INITA.nas
index cb559c31..00807cfa 100644
--- a/Nasal/MCDU/INITA.nas
+++ b/Nasal/MCDU/INITA.nas
@@ -71,6 +71,7 @@ var initInputA = func(key, i) {
 				if (ci != nil and ci >= 0 and ci <= 999) {
 					fmgc.FMGCInternal.costIndex = ci;
 					fmgc.FMGCInternal.costIndexSet = 1;
+					fmgc.FMGCNodes.costIndex.setValue(fmgc.FMGCInternal.costIndex);
 					mcdu_scratchpad.scratchpads[i].empty();
 				} else {
 					mcdu_message(i, "NOT ALLOWED");