fly/IDG-A32X
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Bugfix: catch a potential floating point error as reccomended by Richard, attempt to fix nasal nil error

Browse source
This commit is contained in:
Jonathan Redpath 2018-09-14 11:00:34 +01:00
parent 3631ffee9f
commit c5ed493558
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Models/Instruments/ND/canvas/ND.nas
View file

@ -219,13 +219,11 @@ var canvas_ND_1_test = {
return ["Test_white","Test_text"];
},
update: func() {
elapsedtime = getprop("/sim/time/elapsed-sec");
if (du2_test_time.getValue() + 1 >= elapsedtime and getprop("/modes/cpt-du-xfr") != 1) {
elapsedtime = getprop("/sim/time/elapsed-sec") or 0;
if ((du2_test_time.getValue() + 1 >= elapsedtime) and getprop("/modes/cpt-du-xfr") != 1) {
me["Test_white"].show();
me["Test_text"].hide();
} else if (du1_test_time.getValue() + 1 >= elapsedtime and getprop("/modes/cpt-du-xfr") == 1) {
print(du1_test_time.getValue());
print(elapsedtime);
} else if ((du1_test_time.getValue() + 1 >= elapsedtime) and getprop("/modes/cpt-du-xfr") != 0) {
print(getprop("/modes/cpt-du-xfr"));
me["Test_white"].show();
me["Test_text"].hide();
@ -263,11 +261,11 @@ var canvas_ND_2_test = {
return ["Test_white","Test_text"];
},
update: func() {
elapsedtime = getprop("/sim/time/elapsed-sec");
if (du5_test_time.getValue() + 1 >= elapsedtime and getprop("/modes/cpt-du-xfr") != 1) {
elapsedtime = getprop("/sim/time/elapsed-sec") or 0;
if ((du5_test_time.getValue() + 1 >= elapsedtime) and getprop("/modes/cpt-du-xfr") != 1) {
me["Test_white"].show();
me["Test_text"].hide();
} else if (du6_test_time.getValue() + 1 >= elapsedtime and getprop("/modes/cpt-du-xfr") == 1) {
} else if ((du6_test_time.getValue() + 1 >= elapsedtime) and getprop("/modes/cpt-du-xfr") != 0) {
me["Test_white"].show();
me["Test_text"].hide();
} else {

10
Models/Instruments/PFD/PFD.nas
View file

@ -1148,10 +1148,11 @@ var canvas_PFD_1_test = {
return ["Test_white","Test_text"];
},
update: func() {
if (du1_test_time.getValue() + 1 >= elapsedtime.getValue() and cpt_du_xfr.getValue() != 1) {
et = elapsedtime.getValue() or 0;
if ((du1_test_time.getValue() + 1 >= et) and cpt_du_xfr.getValue() != 1) {
me["Test_white"].show();
me["Test_text"].hide();
} else if (du2_test_time.getValue() + 1 >= elapsedtime.getValue() and cpt_du_xfr.getValue() == 1) {
} else if ((du2_test_time.getValue() + 1 >= et) and cpt_du_xfr.getValue() != 0) {
print(du2_test_time.getValue());
print(elapsedtime.getValue());
print(cpt_du_xfr.getValue());
@ -1191,10 +1192,11 @@ var canvas_PFD_2_test = {
return ["Test_white","Test_text"];
},
update: func() {
if (du6_test_time.getValue() + 1 >= elapsedtime.getValue() and fo_du_xfr.getValue() != 1) {
et = elapsedtime.getValue() or 0;
if ((du6_test_time.getValue() + 1 >= et) and fo_du_xfr.getValue() != 1) {
me["Test_white"].show();
me["Test_text"].hide();
} else if (du5_test_time.getValue() + 1 >= elapsedtime.getValue() and fo_du_xfr.getValue() == 1) {
} else if ((du5_test_time.getValue() + 1 >= et) and fo_du_xfr.getValue() != 0) {
me["Test_white"].show();
me["Test_text"].hide();
} else {