From b030c2239d6ebbd4ef8dcfa76d73ad16635ff7c1 Mon Sep 17 00:00:00 2001 From: Ryan Miller Date: Wed, 22 Jun 2011 12:10:03 -0400 Subject: [PATCH 1/3] Animated jetways: Small fix for the editor not converting STG jetways correctly --- Nasal/jetways_edit/jetways_edit.nas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nasal/jetways_edit/jetways_edit.nas b/Nasal/jetways_edit/jetways_edit.nas index adb4d9aab..43191f8b7 100644 --- a/Nasal/jetways_edit/jetways_edit.nas +++ b/Nasal/jetways_edit/jetways_edit.nas @@ -466,7 +466,7 @@ var convert_stg = func append(jetway_array, hash); } - var airport = getprop("/sim/jetways/closest-airport-id"); + var airport = getprop("/sim/airport/closest-airport-id"); if (airport == "") return; var i = 0; var loop = func From 8254ae53bde7a99fdaf2fdfabd3e8fd1f7826728 Mon Sep 17 00:00:00 2001 From: Ryan Miller Date: Wed, 22 Jun 2011 12:12:43 -0400 Subject: [PATCH 2/3] Animated jetways: Change editor STG function to use new Models/Airport/Jetway directory --- Nasal/jetways_edit/jetways_edit.nas | 76 ++++++++++++++--------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/Nasal/jetways_edit/jetways_edit.nas b/Nasal/jetways_edit/jetways_edit.nas index 43191f8b7..6b0826cfa 100644 --- a/Nasal/jetways_edit/jetways_edit.nas +++ b/Nasal/jetways_edit/jetways_edit.nas @@ -15,21 +15,21 @@ ### This class specifies the offsets used when converting static jetways using the STG converter ### var Static_jetway = [ - # Models/Airport/jetway-movable.ac - # Models/Airport/jetway-movable.xml - # Models/Airport/jetway-movable-2.ac - # Models/Airport/jetway-movable-2.xml - # Models/Airport/jetway-movable-3.ac - # Models/Airport/jetway-movable-3.xml + # Models/Airport/Jetway/jetway-movable.ac + # Models/Airport/Jetway/jetway-movable.xml + # Models/Airport/Jetway/jetway-movable-2.ac + # Models/Airport/Jetway/jetway-movable-2.xml + # Models/Airport/Jetway/jetway-movable-3.ac + # Models/Airport/Jetway/jetway-movable-3.xml { models: [ - "Models/Airport/jetway-movable.ac", - "Models/Airport/jetway-movable.xml", - "Models/Airport/jetway-movable-2.ac", - "Models/Airport/jetway-movable-2.xml", - "Models/Airport/jetway-movable-3.ac", - "Models/Airport/jetway-movable-3.xml" + "Models/Airport/Jetway/jetway-movable.ac", + "Models/Airport/Jetway/jetway-movable.xml", + "Models/Airport/Jetway/jetway-movable-2.ac", + "Models/Airport/Jetway/jetway-movable-2.xml", + "Models/Airport/Jetway/jetway-movable-3.ac", + "Models/Airport/Jetway/jetway-movable-3.xml" ], offsets: { @@ -48,15 +48,15 @@ var Static_jetway = model: "generic", airline: "None" }, - # Models/Airport/jetway.xml - # Models/Airport/jetway-ba.ac - # Models/Airport/jetway-ba.xml + # Models/Airport/Jetway/jetway.xml + # Models/Airport/Jetway/jetway-ba.ac + # Models/Airport/Jetway/jetway-ba.xml { models: [ - "Models/Airport/jetway.xml", - "Models/Airport/jetway-ba.ac", - "Models/Airport/jetway-ba.xml" + "Models/Airport/Jetway/jetway.xml", + "Models/Airport/Jetway/jetway-ba.ac", + "Models/Airport/Jetway/jetway-ba.xml" ], offsets: { @@ -75,13 +75,13 @@ var Static_jetway = model: "generic", airline: "None" }, - # Models/Airport/jetway-737-ba.ac - # Models/Airport/jetway-737-ba.xml + # Models/Airport/Jetway/jetway-737-ba.ac + # Models/Airport/Jetway/jetway-737-ba.xml { models: [ - "Models/Airport/jetway-737-ba.ac", - "Models/Airport/jetway-737-ba.xml" + "Models/Airport/Jetway/jetway-737-ba.ac", + "Models/Airport/Jetway/jetway-737-ba.xml" ], offsets: { @@ -100,13 +100,13 @@ var Static_jetway = model: "generic", airline: "None" }, - # Models/Airport/jetway-747-ba.ac - # Models/Airport/jetway-747-ba.xml + # Models/Airport/Jetway/jetway-747-ba.ac + # Models/Airport/Jetway/jetway-747-ba.xml { models: [ - "Models/Airport/jetway-747-ba.ac", - "Models/Airport/jetway-747-ba.xml" + "Models/Airport/Jetway/jetway-747-ba.ac", + "Models/Airport/Jetway/jetway-747-ba.xml" ], offsets: { @@ -125,13 +125,13 @@ var Static_jetway = model: "generic", airline: "None" }, - # Models/Airport/jetway-a320-ba.ac - # Models/Airport/jetway-a320-ba.xml + # Models/Airport/Jetway/jetway-a320-ba.ac + # Models/Airport/Jetway/jetway-a320-ba.xml { models: [ - "Models/Airport/jetway-a320-ba.ac", - "Models/Airport/jetway-a320-ba.xml" + "Models/Airport/Jetway/jetway-a320-ba.ac", + "Models/Airport/Jetway/jetway-a320-ba.xml" ], offsets: { @@ -150,13 +150,13 @@ var Static_jetway = model: "generic", airline: "None" }, - # Models/Airport/AutoGate-ba.ac - # Models/Airport/AutoGate.xml + # Models/Airport/Jetway/AutoGate-ba.ac + # Models/Airport/Jetway/AutoGate.xml { models: [ - "Models/Airport/AutoGate-ba.ac", - "Models/Airport/AutoGate.xml" + "Models/Airport/Jetway/AutoGate-ba.ac", + "Models/Airport/Jetway/AutoGate.xml" ], offsets: { @@ -175,13 +175,13 @@ var Static_jetway = model: "generic", airline: "None" }, - # Models/Airport/DockingGate-ba.ac - # Models/Airport/DockingGate.xml + # Models/Airport/Jetway/DockingGate-ba.ac + # Models/Airport/Jetway/DockingGate.xml { models: [ - "Models/Airport/DockingGate-ba.ac", - "Models/Airport/DockingGate.xml" + "Models/Airport/Jetway/DockingGate-ba.ac", + "Models/Airport/Jetway/DockingGate.xml" ], offsets: { From 0685d0127d2167dc064798e6eceb2cbc24960510 Mon Sep 17 00:00:00 2001 From: Ryan Miller Date: Thu, 23 Jun 2011 17:35:35 -0400 Subject: [PATCH 3/3] Animated jetways: Fix shift-click in the jetway editor not setting _edit to false on the current jetway --- Nasal/jetways_edit/jetways_edit.nas | 1 + 1 file changed, 1 insertion(+) diff --git a/Nasal/jetways_edit/jetways_edit.nas b/Nasal/jetways_edit/jetways_edit.nas index 6b0826cfa..c8eebc369 100644 --- a/Nasal/jetways_edit/jetways_edit.nas +++ b/Nasal/jetways_edit/jetways_edit.nas @@ -224,6 +224,7 @@ var click = func(pos) } elsif (kbd_shift.getBoolValue()) { + if (selected_jetway != nil) selected_jetway._edit = 0; selected_jetway = nil; } elsif (kbd_ctrl.getBoolValue())