1
0
Fork 0

Merge branch 'dev' into 3D

This commit is contained in:
Jonathan Redpath 2022-01-31 13:37:34 +00:00
commit 57f6015be0
2 changed files with 2 additions and 3 deletions

View file

@ -987,7 +987,6 @@ var canvas_MCDU_base = {
me.dynamicPageFunc(myReceivedMessages[i]["L" ~ x], "Simple_L" ~ x);
}
me.colorLeft(myReceivedMessages[i].L1[2],myReceivedMessages[i].L2[2],myReceivedMessages[i].L3[2],myReceivedMessages[i].L4[2],myReceivedMessages[i].L5[2],myReceivedMessages[i].L6[2]);
me["Simple_L6"].setColor(WHITE);
}
pageSwitch[i].setBoolValue(1);
}
@ -1078,7 +1077,7 @@ var canvas_MCDU_base = {
me["Simple_C1S"].setText(myReceivedMessage[i].C1[1]);
me["Simple_R1S"].setText(myReceivedMessage[i].R1[1]);
me.colorLeft(myReceivedMessage[i].L1[2],myReceivedMessage[i].L2[2],myReceivedMessage[i].L3[2],myReceivedMessage[i].L4[2],myReceivedMessage[i].L5[2],myReceivedMessage[i].L6[2]);
me["Simple_L6"].setColor(WHITE);
me["Simple_L6"].setText(" RETURN");
me["Simple_C1S"].setColor(GREEN);
}
pageSwitch[i].setBoolValue(1);

View file

@ -80,7 +80,7 @@ var dirTo = {
var x = 0;
me.vector = [];
for (var i = 1 + (me.scroll); i < size(canvas_mcdu.myFpln[me.computer].planList) - 2; i = i + 1) {
if (canvas_mcdu.myFpln[me.computer].planList[i].wp.wp_name == "DISCONTINUITY" or canvas_mcdu.myFpln[me.computer].planList[i].wp.wp_name == "VECTORS" or canvas_mcdu.myFpln[me.computer].planList[i].wp.wp_name == "T-P" or canvas_mcdu.myFpln[me.computer].planList[i].wp.wp_type == "hdgToAlt") { continue; } # can't ever have tmpy with dir to
if (canvas_mcdu.myFpln[me.computer].planList[i].wp.wp_name == "DISCONTINUITY" or canvas_mcdu.myFpln[me.computer].planList[i].wp.wp_name == "VECTORS" or canvas_mcdu.myFpln[me.computer].planList[i].wp.wp_name == "T-P" or canvas_mcdu.myFpln[me.computer].planList[i].wp.wp_type == "hdgToAlt") { continue; }
if (canvas_mcdu.myFpln[me.computer].planList[i].index > fmgc.flightPlanController.arrivalIndex[2]) {
continue;
}