fly/A320-family
1
0
Fork 0
Code Activity

Bugfix ACARS received message interface; instead of denying station, send back an INVALID STATION ACARS message

Browse source
This commit is contained in:
legoboyvdlp R 2020-10-23 11:45:49 +01:00
parent 7990e8349a
commit b847070a47
2 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Nasal/MCDU/RECEIVEDMESSAGES.nas
View file

@ -73,7 +73,7 @@ var receivedMessagesPage = {
if (me.size >= (me.curPage * 5) + -4) {
message = ReceivedMessagesDatabase.database.vector[-5 + (me.curPage * 5)];
me.L1[0] = " " ~ left(message.body, 23);
me.L1[0] = " " ~ left(message.body, size(message.body) > 23 ? 23 : size(message.body));
me.L1[2] = "blu";
if (!message.viewed) {
me.L1[1] = " " ~ message.time ~ " NEW";
@ -85,7 +85,7 @@ var receivedMessagesPage = {
if (me.size >= (me.curPage * 5) + -3) {
message = ReceivedMessagesDatabase.database.vector[-4 + (me.curPage * 5)];
me.L2[0] = " " ~ left(message.body, 23);
me.L2[0] = " " ~ left(message.body, size(message.body) > 23 ? 23 : size(message.body));
me.L2[2] = "blu";
if (!message.viewed) {
me.L2[1] = " " ~ message.time ~ " NEW";
@ -97,7 +97,7 @@ var receivedMessagesPage = {
if (me.size >= (me.curPage * 5) + -2) {
message = ReceivedMessagesDatabase.database.vector[-3 + (me.curPage * 5)];
me.L3[0] = " " ~ left(message.body, 23);
me.L3[0] = " " ~ left(message.body, size(message.body) > 23 ? 23 : size(message.body));
me.L3[2] = "blu";
if (!message.viewed) {
me.L3[1] = " " ~ message.time ~ " NEW";
@ -109,7 +109,7 @@ var receivedMessagesPage = {
if (me.size >= (me.curPage * 5) + -1) {
message = ReceivedMessagesDatabase.database.vector[-2 + (me.curPage * 5)];
me.L4[0] = " " ~ left(message.body, 23);
me.L4[0] = " " ~ left(message.body, size(message.body) > 23 ? 23 : size(message.body));
me.L4[2] = "blu";
if (!message.viewed) {
me.L4[1] = " " ~ message.time ~ " NEW";
@ -121,7 +121,7 @@ var receivedMessagesPage = {
if (me.size >= (me.curPage * 5) + 0) {
message = ReceivedMessagesDatabase.database.vector[-1 + (me.curPage * 5)];
me.L5[0] = " " ~ left(message.body, 23);
me.L5[0] = " " ~ left(message.body, size(message.body) > 23 ? 23 : size(message.body));
me.L5[2] = "blu";
if (!message.viewed) {
me.L5[1] = " " ~ message.time ~ " NEW";
@ -137,7 +137,7 @@ var receivedMessagesPage = {
if (mcdu_scratchpad.scratchpads[me.computer].scratchpad == "CLR") {
ReceivedMessagesDatabase.removeAtIndex(-6 + index + (me.curPage * 5));
me.update();
if (ReceivedMessagesDatabase.getSize() < (me.curPage * 5)) {
if (ReceivedMessagesDatabase.getSize() < (me.curPage * 5) and ReceivedMessagesDatabase.getSize() >= 5) {
me.scrollLeft();
}
mcdu_scratchpad.scratchpads[me.computer].empty();

35
Nasal/Systems/Comm/Notification.nas
View file

@ -107,12 +107,7 @@ var AOC = {
server: 0, # 0 = noaa, 1 = vatsim
newStation: func(airport) {
if (size(airport) == 3 or size(airport) == 4) {
if (size(findAirportsByICAO(airport)) == 0) {
return 2;
} else {
me.station = airport;
return 0;
}
me.station = airport;
} else {
return 1;
}
@ -123,9 +118,18 @@ var AOC = {
}
me.sent = 1;
me.received = 0;
var sentTime = left(getprop("/sim/time/gmt-string"), 5);
me.sentTime = split(":", sentTime)[0] ~ "." ~ split(":", sentTime)[1] ~ "Z";
if (size(findAirportsByICAO(me.station)) == 0) {
me.received = 1;
me.receivedTime = me.sentTime;
var message = mcdu.ACARSMessage.new(me.receivedTime, "INVALID STATION " ~ me.station);
mcdu.ReceivedMessagesDatabase.addMessage(message);
return 0;
}
if (me.selectedType == "HOURLY WX") {
var result = me.fetchMETAR(atsu.AOC.station, i);
if (result == 0) {
@ -225,13 +229,18 @@ var AOC = {
};
var ATIS = {
station: nil,
lastATIS: nil,
sent: 0,
sentTime: nil,
received: 0,
receivedTime: nil,
server: 0,
new: func() {
var ATIS = { parents: [ATIS] };
ATIS.station = nil;
ATIS.lastATIS = nil;
ATIS.sent = 0;
ATIS.sentTime = nil;
ATIS.received = 0;
ATIS.receivedTime = nil;
ATIS.receivedCode = nil;
ATIS.server = 0;
return ATIS;
},
newStation: func(airport) {
if (size(airport) == 3 or size(airport) == 4) {
if (size(findAirportsByICAO(airport)) == 0) {