Line 0
Link Here
|
|
|
1 |
--- src/WEDImportExport/WED_AptIE.cpp.orig 2018-07-05 06:19:23 UTC |
2 |
+++ src/WEDImportExport/WED_AptIE.cpp |
3 |
@@ -309,7 +309,7 @@ void AptExportRecursive(WED_Thing * what |
4 |
* a bogus export. */ |
5 |
if(dynamic_cast<WED_OverlayImage *>(what)) return; |
6 |
|
7 |
- if (apt = dynamic_cast<WED_Airport *>(what)) |
8 |
+ if ((apt = dynamic_cast<WED_Airport *>(what)) != NULL) |
9 |
{ |
10 |
apts.push_back(AptInfo_t()); |
11 |
apt->Export(apts.back()); |
12 |
@@ -338,11 +338,11 @@ void AptExportRecursive(WED_Thing * what |
13 |
|
14 |
#endif |
15 |
} |
16 |
- else if (bcn = dynamic_cast<WED_AirportBeacon *>(what)) |
17 |
+ else if ((bcn = dynamic_cast<WED_AirportBeacon *>(what)) != NULL) |
18 |
{ |
19 |
bcn->Export(apts.back().beacon); |
20 |
} |
21 |
- else if (bou = dynamic_cast<WED_AirportBoundary *>(what)) |
22 |
+ else if ((bou == dynamic_cast<WED_AirportBoundary *>(what)) != 0) |
23 |
{ |
24 |
apts.back().boundaries.push_back(AptBoundary_t()); |
25 |
bou->Export(apts.back().boundaries.back()); |
26 |
@@ -357,44 +357,44 @@ void AptExportRecursive(WED_Thing * what |
27 |
return; // bail out - we already got the children. |
28 |
|
29 |
} |
30 |
- else if (cha = dynamic_cast<WED_AirportChain *>(what)) |
31 |
+ else if ((cha = dynamic_cast<WED_AirportChain *>(what)) != NULL) |
32 |
{ |
33 |
apts.back().lines.push_back(AptMarking_t()); |
34 |
cha->Export(apts.back().lines.back()); |
35 |
ExportLinearPath(cha, apts.back().lines.back().area); |
36 |
return; // don't waste time with nodes - for speed |
37 |
} |
38 |
- else if (sgn = dynamic_cast<WED_AirportSign *>(what)) |
39 |
+ else if ((sgn = dynamic_cast<WED_AirportSign *>(what)) != NULL) |
40 |
{ |
41 |
apts.back().signs.push_back(AptSign_t()); |
42 |
sgn->Export(apts.back().signs.back()); |
43 |
} |
44 |
- else if (hel = dynamic_cast<WED_Helipad *>(what)) |
45 |
+ else if ((hel = dynamic_cast<WED_Helipad *>(what)) != NULL) |
46 |
{ |
47 |
apts.back().helipads.push_back(AptHelipad_t()); |
48 |
hel->Export(apts.back().helipads.back()); |
49 |
} |
50 |
- else if (lit = dynamic_cast<WED_LightFixture *>(what)) |
51 |
+ else if ((lit = dynamic_cast<WED_LightFixture *>(what)) != NULL) |
52 |
{ |
53 |
apts.back().lights.push_back(AptLight_t()); |
54 |
lit->Export(apts.back().lights.back()); |
55 |
} |
56 |
- else if (ram = dynamic_cast<WED_RampPosition *>(what)) |
57 |
+ else if ((ram = dynamic_cast<WED_RampPosition *>(what)) != NULL) |
58 |
{ |
59 |
apts.back().gates.push_back(AptGate_t()); |
60 |
ram->Export(apts.back().gates.back()); |
61 |
} |
62 |
- else if (rwy = dynamic_cast<WED_Runway *>(what)) |
63 |
+ else if ((rwy = dynamic_cast<WED_Runway *>(what)) != NULL) |
64 |
{ |
65 |
apts.back().runways.push_back(AptRunway_t()); |
66 |
rwy->Export(apts.back().runways.back()); |
67 |
} |
68 |
- else if (sea = dynamic_cast<WED_Sealane *>(what)) |
69 |
+ else if ((sea = dynamic_cast<WED_Sealane *>(what)) != NULL) |
70 |
{ |
71 |
apts.back().sealanes.push_back(AptSealane_t()); |
72 |
sea->Export(apts.back().sealanes.back()); |
73 |
} |
74 |
- else if (tax = dynamic_cast<WED_Taxiway *>(what)) |
75 |
+ else if ((tax = dynamic_cast<WED_Taxiway *>(what)) != NULL) |
76 |
{ |
77 |
apts.back().taxiways.push_back(AptTaxiway_t()); |
78 |
tax->Export(apts.back().taxiways.back()); |
79 |
@@ -409,47 +409,47 @@ void AptExportRecursive(WED_Thing * what |
80 |
} |
81 |
return; // bail out - we already got the children |
82 |
} |
83 |
- else if (twr = dynamic_cast<WED_TowerViewpoint *>(what)) |
84 |
+ else if ((twr = dynamic_cast<WED_TowerViewpoint *>(what)) != NULL) |
85 |
{ |
86 |
twr->Export(apts.back().tower); |
87 |
} |
88 |
- else if (win = dynamic_cast<WED_Windsock *>(what)) |
89 |
+ else if ((win = dynamic_cast<WED_Windsock *>(what)) != NULL) |
90 |
{ |
91 |
apts.back().windsocks.push_back(AptWindsock_t()); |
92 |
win->Export(apts.back().windsocks.back()); |
93 |
} |
94 |
- else if (atc = dynamic_cast<WED_ATCFrequency *>(what)) |
95 |
+ else if ((atc = dynamic_cast<WED_ATCFrequency *>(what)) != NULL ) |
96 |
{ |
97 |
apts.back().atc.push_back(AptATCFreq_t()); |
98 |
atc->Export(apts.back().atc.back()); |
99 |
} |
100 |
#if AIRPORT_ROUTING |
101 |
- else if(flw = dynamic_cast<WED_ATCFlow *>(what)) |
102 |
+ else if((flw = dynamic_cast<WED_ATCFlow *>(what)) != NULL) |
103 |
{ |
104 |
apts.back().flows.push_back(AptFlow_t()); |
105 |
flw->Export(apts.back().flows.back()); |
106 |
} |
107 |
- else if(use = dynamic_cast<WED_ATCRunwayUse *>(what)) |
108 |
+ else if((use = dynamic_cast<WED_ATCRunwayUse *>(what)) != NULL) |
109 |
{ |
110 |
apts.back().flows.back().runway_rules.push_back(AptRunwayRule_t()); |
111 |
use->Export(apts.back().flows.back().runway_rules.back()); |
112 |
} |
113 |
- else if(tim = dynamic_cast<WED_ATCTimeRule *>(what)) |
114 |
+ else if((tim = dynamic_cast<WED_ATCTimeRule *>(what)) != NULL) |
115 |
{ |
116 |
apts.back().flows.back().time_rules.push_back(AptTimeRule_t()); |
117 |
tim->Export(apts.back().flows.back().time_rules.back()); |
118 |
} |
119 |
- else if(wnd = dynamic_cast<WED_ATCWindRule *>(what)) |
120 |
+ else if((wnd = dynamic_cast<WED_ATCWindRule *>(what)) != NULL) |
121 |
{ |
122 |
apts.back().flows.back().wind_rules.push_back(AptWindRule_t()); |
123 |
wnd->Export(apts.back().flows.back().wind_rules.back()); |
124 |
} |
125 |
- else if(trk = dynamic_cast<WED_TruckParkingLocation*>(what)) |
126 |
+ else if((trk = dynamic_cast<WED_TruckParkingLocation*>(what)) != NULL) |
127 |
{ |
128 |
apts.back().truck_parking.push_back(AptTruckParking_t()); |
129 |
trk->Export(apts.back().truck_parking.back()); |
130 |
} |
131 |
- else if(dst = dynamic_cast<WED_TruckDestination*>(what)) |
132 |
+ else if((dst == dynamic_cast<WED_TruckDestination*>(what)) != 0) |
133 |
{ |
134 |
apts.back().truck_destinations.push_back(AptTruckDestination_t()); |
135 |
dst->Export(apts.back().truck_destinations.back()); |