Merge branch 'dev' into 3D
This commit is contained in:
commit
72e783df6b
4 changed files with 11 additions and 11 deletions
|
@ -1840,10 +1840,10 @@ var canvas_MCDU_base = {
|
|||
me.colorLeft("blu", "blu", "blu", "blu", "wht", "wht");
|
||||
me.colorLeftS("wht", "wht", "wht", "wht", "wht", "wht");
|
||||
me.colorLeftArrow("wht", "wht", "wht", "wht", "wht", "wht");
|
||||
me.colorCenter("grn", "grn", "grn", "grn", "wht", "wht");
|
||||
me.colorCenter("wht", "wht", "wht", "wht", "wht", "wht");
|
||||
me.colorCenterS("wht", "wht", "wht", "wht", "wht", "wht");
|
||||
me.colorRight("wht", "wht", "wht", "wht", "wht", "wht");
|
||||
me.colorRightS("wht", "wht", "wht", "wht", "wht", "wht");
|
||||
me.colorRight("blu", "blu", "blu", "blu", "wht", "blu");
|
||||
me.colorRightS("blu", "blu", "blu", "blu", "wht", "wht");
|
||||
me.colorRightArrow("wht", "wht", "wht", "wht", "wht", "wht");
|
||||
|
||||
|
||||
|
@ -1877,7 +1877,11 @@ var canvas_MCDU_base = {
|
|||
if (atsu.ATISInstances[x].station != nil) {
|
||||
me["Simple_L" ~ (x + 1)].setText(" " ~ atsu.ATISInstances[x].station ~ "/" ~ (atsu.ATISInstances[x].type == 0 ? "ARR" : "DEP"));
|
||||
me["Simple_L" ~ (x + 1)].setFont(default);
|
||||
me["Simple_L" ~ (x + 1) ~ "_Arrow"].show();
|
||||
if (atsu.ATISInstances[x].received) {
|
||||
me["Simple_L" ~ (x + 1) ~ "_Arrow"].show();
|
||||
} else {
|
||||
me["Simple_L" ~ (x + 1) ~ "_Arrow"].hide();
|
||||
}
|
||||
} else {
|
||||
me["Simple_L" ~ (x + 1)].setText(" [ ]/[ ]");
|
||||
me["Simple_L" ~ (x + 1)].setFont(symbol);
|
||||
|
|
|
@ -1200,10 +1200,6 @@
|
|||
inkscape:transform-center-y="-345.50518"
|
||||
inkscape:label="#path6714"
|
||||
inkscape:transform-center-x="-0.001953124" /><path
|
||||
style="fill:none;stroke:#ededed;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 497.671,651.001 h 27.578"
|
||||
id="path3823"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
sodipodi:nodetypes="cscc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="altArc"
|
||||
|
|
Before Width: | Height: | Size: 149 KiB After Width: | Height: | Size: 149 KiB |
|
@ -2136,7 +2136,7 @@ var messages_priority_2 = func {
|
|||
if (getprop("/fdm/jsbsim/fadec/thr-locked-flash") == 0) {
|
||||
athr_lock.msg = " ";
|
||||
} else {
|
||||
athr_lock.msg = msgSave
|
||||
athr_lock.msg = msgSave;
|
||||
}
|
||||
athr_lock.active = 1;
|
||||
athr_lock_1.active = 1;
|
||||
|
|
|
@ -358,8 +358,8 @@ var ATIS = {
|
|||
raw = split('"}', raw)[0];
|
||||
} else {
|
||||
if (me.type == 0) {
|
||||
raw = split('{"arr":"', raw)[1];
|
||||
raw = split('","dep":', raw)[0];
|
||||
raw = split('"arr":"', raw)[1];
|
||||
raw = split('","dep":"', raw)[0];
|
||||
} else {
|
||||
raw = split('","dep":"', raw)[1];
|
||||
raw = split('"}', raw)[0];
|
||||
|
|
Loading…
Reference in a new issue