(svn r10947) [NewGRF_ports] -Change: Intercontinental airport.
First cut of state machine for testing. Not yet optimised.
Binary file bin/data/airportsextended.grf has changed
--- a/bin/data/sprites/airportsextended.nfo Sun Aug 19 17:37:27 2007 +0000
+++ b/bin/data/sprites/airportsextended.nfo Sun Aug 19 21:34:19 2007 +0000
@@ -1774,111 +1774,111 @@
1A 4D // positions 00-4C
// Intercontinental Airport : Position 00
- \w7 \w87 \w0 40 \wx0007 00 // HANGAR
- 05
+ \w8 \w81 \w0 40 \wx0000 00 // HANGAR
+ 04
40 4E 00 02
7E 00 7E 46 4E 7F 00 02
7E 01 7E 46 4E 7F 00 02
41 7E 46 4E 7F 00 02
- 00 00 00 02
// Intercontinental Airport : Position 01
- \w135 \w72 \w0 40 \wx0007 00 // HANGAR
+ \w136 \w65 \w0 40 \wx0000 00 // HANGAR
04
40 48 00 03
- 7E 01 48 00 03
- 7E 00 48 00 03
- 00 00 00 03
+ 7E 01 7E 47 48 7F 00 03
+ 7E 00 7E 47 48 4B 7F 00 03
+ 41 7E 4F 48 7F 00 03
// Intercontinental Airport : Position 02
- \w7 \w104 \w0 00 \wx0000 4E
+ \w8 \w104 \w0 00 \wx0000 4E
0A
40 00 00 00
- 41 46 00 1B
+ 41 46 4E 1B
05 00 00 1A
06 00 00 1A
+ 07 00 00 1A
08 00 00 1A
- 09 00 00 1A
25 00 00 1A
26 00 00 1A
51 00 00 4A
- 00 00 00 1B
+ 00 46 4E 1B
// Intercontinental Airport : Position 03
- \w135 \w88 \w0 00 \wx0000 48
- 03
+ \w136 \w88 \w0 00 \wx0000 48
+ 04
40 00 00 01
51 00 00 4B
- 00 00 00 14
+ 41 4F 48 3A
+ 00 47 48 14
// Intercontinental Airport : Position 04
- \w56 \w120 \w0 01 \wx000D 00 // TERM1
+ \w56 \w120 \w0 01 \wx000D 01 // TERM1
03
- 01 00 00 1A
- 40 7E 46 4E 7F 00 1A
- 00 00 00 1A
+ 01 01 46 1A
+ 40 7E 46 4E 7F 01 1A
+ 41 7E 46 52 7F 01 1A
// Intercontinental Airport : Position 05
\w56 \w104 \w0 02 \wx000B 02 // TERM2
03
- 02 02 00 1B
- 40 7E 46 4E 7F 00 1B
- 00 00 00 1B
+ 02 02 46 1B
+ 40 7E 46 4E 7F 02 1B
+ 41 7E 46 52 7F 02 1B
// Intercontinental Airport : Position 06
\w56 \w88 \w0 03 \wx000B 03 // TERM3
03
- 03 03 00 1C
- 40 7E 46 4E 7F 00 1C
- 00 00 00 1C
+ 03 03 46 1C
+ 40 7E 46 4E 7F 03 1C
+ 41 7E 46 52 7F 03 1C
// Intercontinental Airport : Position 07
\w56 \w72 \w0 04 \wx000B 04 // TERM4
03
- 04 04 00 1D
- 40 7E 46 4E 7F 00 1D
- 00 00 00 1D
+ 04 04 46 1D
+ 40 7E 46 4E 7F 04 1D
+ 41 7E 46 52 7F 04 1D
// Intercontinental Airport : Position 08
\w88 \w120 \w0 05 \wx0001 05 // TERM5
03
- 05 05 00 12
- 40 48 00 12
- 00 00 00 12
+ 05 05 47 12
+ 40 7E 47 48 7F 05 12
+ 41 7E 47 4F 7F 05 12
// Intercontinental Airport : Position 09
\w88 \w104 \w0 06 \wx0003 06 // TERM6
03
- 06 06 00 13
- 40 48 00 13
- 00 00 00 13
+ 06 06 47 13
+ 40 7E 47 48 7F 06 13
+ 41 7E 47 4F 7F 06 13
// Intercontinental Airport : Position 0A
- \w88 \w88 \w0 08 \wx0003 07 // TERM7
+ \w88 \w88 \w0 07 \wx0003 07 // TERM7
03
- 08 07 00 14
- 40 48 00 14
- 00 00 00 14
+ 07 07 47 14
+ 40 7E 47 48 7F 07 14
+ 41 7E 47 4F 7F 07 14
// Intercontinental Airport : Position 0B
- \w88 \w72 \w0 09 \wx0003 08 // TERM8
+ \w88 \w72 \w0 08 \wx0003 08 // TERM8
03
- 09 08 00 15
- 40 48 00 15
- 00 00 00 15
+ 08 08 47 15
+ 40 7E 47 48 7F 08 15
+ 41 7E 47 4F 7F 08 15
// Intercontinental Airport : Position 0C
\w88 \w56 \w0 25 \wx0007 25 // HELIPAD1
03
25 25 00 0C
- 40 00 00 46
+ 40 7E 47 48 7F 25 16
51 00 00 48
// Intercontinental Airport : Position 0D
\w72 \w56 \w0 26 \wx0003 26 // HELIPAD2
03
26 26 00 0D
- 40 00 00 47
+ 40 7E 47 48 4B 7F 26 47
51 00 00 49
// Intercontinental Airport : Position 0E
@@ -1889,7 +1889,7 @@
// Intercontinental Airport : Position 0F
\w56 \w136 \w0 00 \wx0000 49
01
- 00 49 00 10
+ 00 4A 49 10
// Intercontinental Airport : Position 10
\w88 \w136 \w0 00 \wx0000 4A
@@ -1898,46 +1898,45 @@
// Intercontinental Airport : Position 11
\w104 \w136 \w0 00 \wx0000 4A
- 01
- 00 4A 00 12
+ 03
+ 41 7E 47 4F 7F 4A 12
+ 51 7E 4B 47 25 7F 00 12
+ 00 47 4A 12
// Intercontinental Airport : Position 12
\w104 \w120 \w0 00 \wx0000 47
- 04
- 05 05 00 08
- 41 00 00 13
- 51 25 00 13
- 00 4B 00 13
+ 02
+ 05 05 47 08
+ 00 00 00 13
// Intercontinental Airport : Position 13
\w104 \w104 \w0 00 \wx0000 47
- 05
- 06 06 00 09
+ 04
+ 06 06 47 09
05 00 00 12
- 41 00 00 39
- 51 25 00 14
- 00 4B 00 14
+ 41 4F 47 39
+ 00 00 00 14
// Intercontinental Airport : Position 14
\w104 \w88 \w0 00 \wx0000 47
06
- 08 07 00 0A
+ 07 07 47 0A
05 00 00 13
06 00 00 13
- 40 48 00 03
- 41 00 00 13
- 00 4B 00 15
+ 40 48 47 03
+ 41 4F 47 39
+ 00 00 00 15
// Intercontinental Airport : Position 15
\w104 \w72 \w0 00 \wx0000 47
07
- 09 08 00 0B
- 40 48 00 14
+ 08 08 47 0B
+ 40 00 00 14
05 00 00 14
06 00 00 14
- 08 00 00 14
+ 07 00 00 14
41 00 00 14
- 00 4B 00 16
+ 00 00 00 16
// Intercontinental Airport : Position 16
\w104 \w56 \w0 00 \wx0000 47
@@ -1945,14 +1944,15 @@
40 00 00 15
05 00 00 15
06 00 00 15
+ 07 00 00 15
08 00 00 15
- 09 00 00 15
41 00 00 15
- 00 00 00 17
+ 00 4B 47 17
// Intercontinental Airport : Position 17
\w104 \w40 \w0 00 \wx0000 4B
- 01
+ 02
+ 40 47 4B 16
00 4B 00 46
// Intercontinental Airport : Position 18
@@ -1962,50 +1962,54 @@
// Intercontinental Airport : Position 19
\w40 \w40 \w0 00 \wx0000 4C
- 02
- 40 7E 46 4E 7F 00 1D
- 00 00 00 1D
+ 06
+ 40 7E 46 4E 7F 4C 1D
+ 01 46 4C 1D
+ 02 46 4C 1D
+ 03 46 4C 1D
+ 04 46 4C 1D
+ 41 7E 46 52 7F 4C 1D
// Intercontinental Airport : Position 1A
\w40 \w120 \w0 00 \wx0000 46
- 0A
- 01 00 00 04
- 40 4E 00 1B
- 05 49 00 0E
- 06 49 00 0E
- 08 49 00 0E
- 09 49 00 0E
- 25 49 00 0E
- 26 49 00 0E
- 51 49 00 0E
+ 09
+ 01 01 46 04
+ 05 49 46 0E
+ 06 49 46 0E
+ 07 49 46 0E
+ 08 49 46 0E
+ 25 49 46 0E
+ 26 49 46 0E
+ 51 49 46 0E
00 00 00 1B
// Intercontinental Airport : Position 1B
\w40 \w104 \w0 00 \wx0000 46
- 0A
- 02 02 00 05
- 40 4E 00 02
+ 0B
+ 02 02 46 05
+ 40 4E 46 02
01 00 00 1A
- 05 00 00 1A
- 06 00 00 1A
- 08 00 00 1A
- 09 00 00 1A
+ 05 00 00 0E
+ 06 00 00 0E
+ 07 00 00 0E
+ 08 00 00 0E
25 00 00 0E
26 00 00 0E
+ 51 00 00 0E
00 00 00 1C
// Intercontinental Airport : Position 1C
\w40 \w88 \w0 00 \wx0000 46
0C
- 03 03 00 06
+ 03 03 46 06
40 4E 00 1B
01 00 00 1B
02 00 00 1B
04 00 00 1D
05 00 00 0E
06 00 00 0E
+ 07 00 00 0E
08 00 00 0E
- 09 00 00 0E
25 00 00 0E
26 00 00 0E
00 00 00 1D
@@ -2013,30 +2017,30 @@
// Intercontinental Airport : Position 1D
\w40 \w72 \w0 00 \wx0000 46
04
- 04 04 00 07
+ 04 04 46 07
40 4E 00 1B
- 41 00 00 1E
+ 41 52 46 1E
00 00 00 1C
// Intercontinental Airport : Position 1E
\w18 \w72 \w0 00 \wx0000 52
01
- 00 52 00 1F
+ 00 43 52 1F
// Intercontinental Airport : Position 1F
\w8 \w40 \w0 00 \wx0000 43
01
- 00 43 00 20
+ 00 41 43 20
// Intercontinental Airport : Position 20
\w8 \w24 \w0 41 \wx000B 41 // TAKEOFF
01
- 41 41 00 21
+ 00 00 00 21
// Intercontinental Airport : Position 21
- \w119 \w24 \w0 00 \wx0010 41
+ \w102 \w24 \w0 00 \wx0090 41
01
- 00 41 00 22
+ 00 00 41 22
// Intercontinental Airport : Position 22
\w117 \w24 \w0 42 \wx0010 00 // STARTTAKEOFF
@@ -2044,108 +2048,105 @@
00 00 00 23
// Intercontinental Airport : Position 23
- \w197 \w24 \w80 43 \wx0010 00 // ENDTAKEOFF
+ \w197 \w24 \w80 43 \wx0090 00 // ENDTAKEOFF
01
00 00 00 00
// Intercontinental Airport : Position 24
- \w254 \w84 \w0 00 \wx0030 00
+ \w254 \w84 \w80 00 \wx0030 00
01
00 00 00 00
// Intercontinental Airport : Position 25
- \w117 \w168 \w0 44 \wx0010 40 // LANDING
+ \w117 \w168 \w0 44 \wx0090 40 // LANDING
01
- 44 40 00 26
+ 00 40 00 26
// Intercontinental Airport : Position 26
- \w3 \w168 \w0 00 \wx0050 40
+ \w15 \w168 \w0 00 \wx0050 40
01
00 40 00 27
// Intercontinental Airport : Position 27
\w8 \w168 \w0 00 \wx0000 40
01
- 00 40 00 28
+ 00 00 00 28
// Intercontinental Airport : Position 28
\w8 \w144 \w0 45 \wx0000 40 // ENDLANDING
01
- 45 40 00 29
+ 00 44 40 29
// Intercontinental Airport : Position 29
\w8 \w128 \w0 00 \wx0000 44
01
- 00 44 00 2A
+ 00 00 00 2A
// Intercontinental Airport : Position 2A
- \w8 \w120 \w0 00 \wx000B 44
- 04
- 7E 00 46 00 02
- 7E 01 46 00 02
- 40 00 00 02
- 00 00 00 1A
+ \w8 \w120 \w0 00 \wx0000 44
+ 03
+ 7E 00 46 44 1A
+ 7E 01 46 44 1A
+ 40 4E 44 02
// Intercontinental Airport : Position 2B
- \w56 \w344 \w0 00 \wx0030 00
+ \w56 \w344 \w80 00 \wx00B0 00
01
00 00 00 2C
// Intercontinental Airport : Position 2C
- \wxFF38 \w88 \w0 7F \wx0030 00 // FLYING
+ \wxFF38 \w88 \w80 7F \wx00B0 00 // FLYING
04
7F 00 00 2D
- 54 00 00 2F
- 44 00 00 45
+ 54 4D 00 2F
+ 44 51 00 45
00 00 00 2D
// Intercontinental Airport : Position 2D
- \w56 \wxFF58 \w0 00 \wx0030 00
+ \w56 \wxFF58 \w80 00 \wx00B0 00
01
00 00 00 2E
// Intercontinental Airport : Position 2E
- \w312 \w88 \w0 7F \wx0030 00 // FLYING
+ \w312 \w88 \w80 7F \wx00B0 00 // FLYING
03
7F 00 00 2B
- 44 00 00 4C
+ 44 40 00 4C
00 00 00 2B
// Intercontinental Airport : Position 2F
- \w96 \w40 \w0 54 \wx0030 4D // HELILANDING
+ \w96 \w40 \w80 54 \wx00B0 4D // HELILANDING
01
- 00 4D 00 30
+ 00 00 00 30
// Intercontinental Airport : Position 30
- \w96 \w40 \w0 55 \wx0030 4D // HELIENDLANDING
+ \w96 \w40 \w80 55 \wx00B0 4D // HELIENDLANDING
03
- 25 00 00 31
- 26 00 00 32
- 40 00 00 37
+ 25 25 4D 31
+ 26 26 4D 32
+ 40 00 4D 37
// Intercontinental Airport : Position 31
- \w82 \w54 \w0 00 \wx0030 00
+ \w82 \w54 \w80 00 \wx00B0 00
01
00 00 00 33
// Intercontinental Airport : Position 32
- \w64 \w56 \w0 00 \wx0030 00
+ \w64 \w56 \w80 00 \wx00B0 00
01
00 00 00 34
// Intercontinental Airport : Position 33
\w81 \w55 \w0 00 \wx0000 00
- 03
+ 02
25 25 00 0C
40 00 00 37
- 00 00 00 0C
// Intercontinental Airport : Position 34
\w64 \w56 \w0 00 \wx0000 00
- 03
+ 02
26 26 00 0D
40 00 00 37
- 00 00 00 0D
// Intercontinental Airport : Position 35
\w80 \w56 \w80 51 \wx0000 00 // HELITAKEOFF
@@ -2158,9 +2159,10 @@
51 00 00 00
// Intercontinental Airport : Position 37
- \w136 \w96 \w0 00 \wx0030 48
- 01
+ \w136 \w96 \w80 00 \wx0030 48
+ 02
00 48 00 38
+ 7B 7F 00 00 2C
// Intercontinental Airport : Position 38
\w136 \w96 \w0 00 \wx0000 48
@@ -2168,40 +2170,39 @@
00 48 00 03
// Intercontinental Airport : Position 39
- \w126 \w104 \w0 00 \wx0000 4F
- 02
- 41 00 00 3A
- 00 00 00 3A
+ \w120 \w104 \w0 00 \wx0000 4F
+ 01
+ 00 4F 00 3A
// Intercontinental Airport : Position 3A
\w136 \w136 \w0 00 \wx0000 4F
01
- 00 4F 00 3B
+ 00 42 4F 3B
// Intercontinental Airport : Position 3B
\w136 \w152 \w0 41 \wx0003 42 // TAKEOFF
01
- 41 42 00 3C
+ 00 00 00 3C
// Intercontinental Airport : Position 3C
- \w16 \w152 \w0 00 \wx0010 42
+ \w36 \w152 \w0 00 \wx0090 42
01
- 00 42 00 3D
+ 00 00 42 3D
// Intercontinental Airport : Position 3D
\w20 \w152 \w0 42 \wx0010 00 // STARTTAKEOFF
01
- 42 00 00 3E
+ 00 00 00 3E
// Intercontinental Airport : Position 3E
- \wxFFC8 \w152 \w0 43 \wx0010 00 // ENDTAKEOFF
+ \wxFFC8 \w152 \w80 43 \wx0010 00 // ENDTAKEOFF
01
- 43 00 00 00
+ 00 00 00 00
// Intercontinental Airport : Position 3F
- \w24 \w8 \w0 44 \wx0010 51 // LANDING
+ \w24 \w8 \w0 44 \wx0090 51 // LANDING
01
- 44 51 00 40
+ 00 51 00 40
// Intercontinental Airport : Position 40
\w136 \w8 \w0 00 \wx0050 51
@@ -2211,43 +2212,46 @@
// Intercontinental Airport : Position 41
\w136 \w8 \w0 00 \wx0000 51
01
- 00 51 00 42
+ 00 00 00 42
// Intercontinental Airport : Position 42
\w136 \w24 \w0 45 \wx0000 51 // ENDLANDING
01
- 00 51 00 43
+ 00 50 51 43
// Intercontinental Airport : Position 43
\w136 \w40 \w0 00 \wx0000 50
01
- 00 50 00 44
+ 00 00 00 44
// Intercontinental Airport : Position 44
\w136 \w56 \w0 00 \wx0003 50
- 03
- 7E 01 47 00 16
- 7E 00 46 00 16
- 40 48 00 16
+ 04
+ 7E 01 47 50 16
+ 7E 00 7E 47 4B 7F 50 16
+ 40 7E 47 48 7F 50 16
+ 00 00 00 44
// Intercontinental Airport : Position 45
- \wxFFC8 \w8 \w0 00 \wx0030 51
+ \wxFFC8 \w8 \w80 00 \wx00B0 51
01
00 51 00 3F
// Intercontinental Airport : Position 46
\w88 \w40 \w0 00 \wx0000 4B
- 03
- 25 25 00 0C
- 51 25 00 0C
+ 04
+ 25 25 4B 0C
+ 51 25 4B 0C
+ 40 7E 4B 47 48 7F 00 17
00 00 00 47
// Intercontinental Airport : Position 47
\w72 \w40 \w0 00 \wx0000 4B
- 03
- 26 26 00 0D
- 51 25 00 0C
- 00 00 00 18
+ 04
+ 26 26 4B 0D
+ 51 25 4B 0C
+ 40 7E 4B 47 48 7F 00 46
+ 00 00 4B 18
// Intercontinental Airport : Position 48
\w88 \w57 \w0 00 \wx0007 25
@@ -2270,12 +2274,12 @@
51 00 00 00
// Intercontinental Airport : Position 4C
- \w197 \w168 \w0 00 \wx0030 40
+ \w197 \w168 \w80 00 \wx00B0 40
01
00 40 00 25
// Prop1C Vehicle Entry Points
- 1C 2B 2B 2B 2B
+ 1C 2B 2C 2D 2E
// Prop1D Hangar/Depot Locations
1D 02 00 05 01 08 04 02