fly/A320-family
1
0
Fork 0
Code Activity

Sim: properly support version checks for the new 2020.3.xx

Browse source
This commit is contained in:
Josh Davidson 2021-08-01 10:31:48 -04:00
parent a6c5a08b39
commit 4997094296
3 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
AircraftConfig/acconfig.nas
View file

@ -104,14 +104,30 @@ setlistener("/systems/acconfig/new-revision", func {
}
});
var fgfsMin = split(".", getprop("/sim/minimum-fg-version"));
var fgfsVer = split(".", getprop("/sim/version/flightgear"));
var versionCheck = func() {
if (fgfsVer[0] < fgfsMin[0] or fgfsVer[1] < fgfsMin[1]) {
return 0;
} else if (fgfsVer[1] == fgfsMin[1]) {
if (fgfsVer[2] < fgfsMin[2]) {
return 0;
} else {
return 1;
}
} else {
return 1;
}
}
var mismatch_chk = func {
if (num(string.replace(getprop("/sim/version/flightgear"),".","")) < 201920) {
if (!versionCheck()) {
setprop("/systems/acconfig/mismatch-code", "0x121");
setprop("/systems/acconfig/mismatch-reason", "FGFS version is too old! Please update FlightGear to at least 2019.2.0.");
setprop("/systems/acconfig/mismatch-reason", "FGFS version is too old! Please update FlightGear to at least " ~ getprop("/sim/minimum-fg-version") ~ ".");
if (getprop("/systems/acconfig/out-of-date") != 1) {
error_mismatch.open();
}
libraries.systemsLoop.stop();
print("Mismatch: 0x121");
welcome_dlg.close();
} else if (getprop("/gear/gear[0]/wow") == 0 or getprop("/position/altitude-ft") >= 15000) {
@ -120,7 +136,6 @@ var mismatch_chk = func {
if (getprop("/systems/acconfig/out-of-date") != 1) {
error_mismatch.open();
}
libraries.systemsLoop.stop();
print("Mismatch: 0x223");
welcome_dlg.close();
} else if (getprop("/systems/acconfig/libraries-loaded") != 1) {
@ -129,7 +144,6 @@ var mismatch_chk = func {
if (getprop("/systems/acconfig/out-of-date") != 1) {
error_mismatch.open();
}
libraries.systemsLoop.stop();
print("Mismatch: 0x247");
welcome_dlg.close();
}

2
Nasal/Libraries/libraries.nas
View file

@ -176,7 +176,7 @@ var update_items = [
];
var systemsLoop = func(notification) {
if (!systemsInitialized) { return; }
if (!systemsInitialized and getprop("/systems/acconfig/mismatch-code") != "0x000") { return; }
systems.PNEU.loop(notification);
systems.ADIRS.loop(notification);
systems.BrakeSys.update(notification);

2
revision.txt
View file

@ -1 +1 @@
48
49