(svn r10909) [NewGRF_ports] -Feature: Added Metropolitan airport to airportsextended.grf. Also added remaining minipics to airportsextended.pcx.
Metropolitan airport loads from old games.
Binary file bin/data/airportsextended.grf has changed
--- a/bin/data/sprites/airportsextended.nfo Wed Aug 15 10:30:49 2007 +0000
+++ b/bin/data/sprites/airportsextended.nfo Wed Aug 15 21:09:34 2007 +0000
@@ -1,7 +1,7 @@
// Automatically generated by GRFCODEC. Do not modify!
// (Info version 7)
// Format: spritenum pcxfile xpos ypos compression ysize xsize xrel yrel
- 0 * 4 72 00 00 00
+ 0 * 4 7C 00 00 00
// Length of GRF in sprites
// if version of TTDPatch higher than X, skip two sprites
@@ -22,7 +22,7 @@
7 * 112 08 07 "OAPX" "OpenTTD Extended Airports" 00 "Commuter, Metropolitan, International, Intercontinental, Helistation, Helidepot" 00
// Define a sprite set for stations, one set, 95 views
- 8 * 4 01 0D 01 61
+ 8 * 4 01 0D 01 65
9 sprites/airportsextended.pcx 194 8 09 31 64 -31 0
10 sprites/airportsextended.pcx 274 8 09 31 64 -31 0
11 sprites/airportsextended.pcx 354 8 09 31 64 -31 0
@@ -119,10 +119,15 @@
102 sprites/airportsextended.pcx 162 344 09 31 64 -31 0
103 sprites/airportsextended.pcx 242 344 09 31 64 -31 0
104 sprites/airportsextended.pcx 402 344 09 64 96 0 0
- 105 sprites/airportsextended.pcx 510 344 09 64 96 0 0
+ 105 sprites/airportsextended.pcx 510 343 09 64 96 0 0
+ 106 sprites/airportsextended.pcx 618 343 09 64 96 0 0
+ 107 sprites/airportsextended.pcx 7 384 09 64 96 0 0
+ 108 sprites/airportsextended.pcx 114 384 09 64 96 0 0
+ 109 sprites/airportsextended.pcx 221 383 09 64 96 0 0
// Define a graphics set ID (cargo ID = 0
- 106 * 7 02 0D 00
+//!!Error (58): Action 2 declaring no loaded sets.
+ 110 * 7 02 0D 00
// Little/lots set
00 01
// Set to define the graphics for (set #0)
@@ -132,7 +137,7 @@
//Commuter Airport
// 10 properties to change, 1 station to change, station id = 0
- 107 * 1182 00 0D 0A 01 00
+ 111 * 1182 00 0D 0A 01 00
// Class ID
08 "SMLL"
// Sprite layout, of 22 sprites
@@ -508,7 +513,7 @@
//availability date varaction2
//commuter airport available from 1981 (1920+61) to 2175 (1920+255)
- 108 * 14 02 0D
+ 112 * 14 02 0D
02 // ID
81 01 // Variable 01 (current date)
00 FF
@@ -516,7 +521,8 @@
01 FF 3E FF //1951-2175
00 FF
- 109 * 14 02 0D
+//!!Error (164): Offset 10: 13 is not a valid callback for this feature.
+ 113 * 14 02 0D
03 // ID
81 0C // Check variable 0C (callback id)
00 FF
@@ -525,15 +531,360 @@
00 00 // Otherwise return the real sprites
// Use graphics ID (1 station, ID 0, 0 cargo specific graphics, default cargo = 0)
- 110 * 7 03 0D 01 00 00 03 00
+ 114 * 7 03 0D 01 00 00 03 00
+
+
+//-------------------------
+// Metropolitan Airport
+//-------------------------
+
+// 10 properties to change, 1 station to change, station id = 01
+ 115 * 927 00 0D 0B 01 01
+
+// Class ID
+ 08 "LRGE"
+
+ //Sprite layout
+ 09 17
+// tilelayout:00 was 31 = 0x1F :
+ 4A 0A 00 00
+ 00 03 00 10 0B 28 5E 8A 00 80
+ 80
+
+// tilelayout:01 was 9 = 0x09 :
+ 4A 0A 00 00
+ 00 00 00 10 01 06 68 8A 00 80
+ 80
+
+// tilelayout:02 was 33 = 0x21 :
+ 4B 0A 00 00
+ 07 0B 00 03 03 0E 63 0A 00 80
+ 00 00 00 10 01 06 68 8A 00 80
+ 80
+
+// tilelayout:03 was 32 = 0x20 :
+ 4A 0A 00 00
+ 0E 00 00 02 10 1C 5F 8A 00 80
+ 00 00 00 02 10 1C 60 0A 00 80
+ 80
+
+// tilelayout:04 was 27 = 0x1B :
+ 4A 0A 00 00
+ 02 00 00 0B 10 28 5A 8A 00 80
+ 80
+
+// tilelayout:05 was 36 = 0x24 :
+ 4A 0A 00 00
+ 00 08 00 0E 03 0E 66 0A 00 80
+ 80
+
+// tilelayout:06 was 29 = 0x1D :
+ 4A 0A 00 00
+ 00 01 00 0E 0E 1E 5C 8A 00 80
+ 80
+
+// tilelayout:07 was 34 = 0x22 :
+ 4B 0A 00 00
+ 02 07 00 03 03 0E 64 0A 00 80
+ 80
+
+// tilelayout:08 was 8 = 0x08 :
+ 4A 0A 00 00
+ 80
+
+// tilelayout:09 was 10 = 0x0A :
+ 4A 0A 00 00
+ 0F 00 00 01 10 06 67 8A 00 80
+ 80
+
+// tilelayout:0A was 30 = 0x1E :
+ 4A 0A 00 00
+ 03 03 00 0A 0B 23 5D 8A 00 80
+ 80
+
+// tilelayout:0B was 11 = 0x0B :
+ 4B 0A 00 00
+ 80
+
+// tilelayout:0C was 35 = 0x23 :
+ 4A 0A 00 00
+ 03 02 00 03 03 0E 65 0A 00 80
+ 80
+
+// tilelayout:0D was 13 = 0x0D :
+ 4D 0A 00 00
+ 80
+
+// tilelayout:0E was 20 = 0x14 :
+ 54 0A 00 00
+ 80
+
+// tilelayout:0F was 21 = 0x15 :
+ 53 0A 00 00
+ 0F 00 00 01 10 06 67 8A 00 80
+ 80
+
+// tilelayout:10 was 102 = 0x66 :
+ 4A 0A 00 00
+ 07 07 00 02 02 08 78 0A 00 80
+ 00 00 00 01 10 06 67 8A 00 80
+ 80
+
+// tilelayout:11 was 28 = 0x1C :
+ 8D 0F 00 00
+ 03 03 00 0A 0A 3C 5B 8A 00 80
+ 0F 00 00 01 10 06 67 8A 00 80
+ 80
+
+// tilelayout:12 was 83 = 0x53 :
+ 59 0A 00 00
+ 80
+
+// tilelayout:13 was 84 = 0x54 :
+ 56 0A 00 00
+ 80
+
+// tilelayout:14 was 26 = 0x1A :
+ 59 0A 00 00
+ 00 0F 00 10 01 06 68 8A 00 80
+ 80
+
+// tilelayout:15 was 23 = 0x17 :
+ 56 0A 00 00
+ 00 0F 00 10 01 06 68 8A 00 80
+ 80
+
+// Metropolitan Airport mini pic
+ 8D 04 00 08
+ 80
+
+// Prop0B Callbacks
+ 0B 01 //Availability
+
+// Define custom layouts
+ 0E 01
+ 01
+ 06 06 16
+ 00 01 02 01 01 03
+ 04 05 06 07 08 09
+ 0A 0B 0C 0D 0E 0F
+ 10 08 08 08 08 11
+ 12 13 13 13 13 12
+ 14 15 15 15 15 14
+
+// Prop19 Vehicle Type
+ 19 03 //Air
+
+// Define Finite State Machine
+ 1A 1B // positions 00-1A
+
+ // Metropolitan Airport : Position 00
+ \w85 \w3 \w0 40 \wx0007 00 // HANGAR
+ 03
+ 40 42 00 01
+ 41 7E 43 42 7F 00 01
+ 00 42 00 01
+
+ // Metropolitan Airport : Position 01
+ \w85 \w27 \w0 00 \wx0000 42
+ 04
+ 40 00 00 00
+ 02 42 00 06
+ 03 42 00 06
+ 00 42 00 07
+
+ // Metropolitan Airport : Position 02
+ \w26 \w41 \w0 01 \wx000B 00 // TERM1
+ 04
+ 01 01 00 07
+ 41 7E 43 42 7F 01 07
+ 51 7E 43 42 7F 01 07
+ 40 42 00 07
+
+ // Metropolitan Airport : Position 03
+ \w56 \w20 \w0 02 \wx0007 02 // TERM2
+ 04
+ 02 02 00 06
+ 41 7E 43 42 7F 02 06
+ 51 7E 43 42 7F 02 06
+ 40 42 00 06
+
+ // Metropolitan Airport : Position 04
+ \w38 \w8 \w0 03 \wx000B 03 // TERM3
+ 04
+ 03 03 00 05
+ 41 7E 43 42 7F 03 05
+ 51 7E 43 42 7F 03 05
+ 40 42 00 05
+
+ // Metropolitan Airport : Position 05
+ \w70 \w6 \w0 00 \wx0000 42
+ 03
+ 02 02 42 03
+ 03 03 42 04
+ 00 42 00 06
+
+ // Metropolitan Airport : Position 06
+ \w70 \w33 \w0 00 \wx0000 42
+ 04
+ 02 42 00 05
+ 03 42 00 05
+ 40 42 00 01
+ 00 42 00 07
+
+ // Metropolitan Airport : Position 07
+ \w44 \w57 \w0 00 \wx0000 42
+ 05
+ 01 01 42 02
+ 41 43 42 08
+ 51 00 00 17
+ 40 42 00 01
+ 00 42 00 06
+
+ // Metropolitan Airport : Position 08
+ \w72 \w57 \w0 00 \wx0000 43
+ 01
+ 00 41 00 09
+
+ // Metropolitan Airport : Position 09
+ \w72 \w71 \w0 00 \wx0000 41
+ 01
+ 00 7E 46 41 7F 43 0A //wait for runway and crossing
+
+ // Metropolitan Airport : Position 0A
+ \w89 \w71 \w0 41 \wx0003 41 // TAKEOFF
+ 01
+ 00 41 00 0B
+
+ // Metropolitan Airport : Position 0B
+ \w3 \w71 \w00 42 \wx0010 00 // STARTTAKEOFF
+ 01
+ 00 00 7E 41 46 7F 0C //release crossing and runway
+
+ // Metropolitan Airport : Position 0C
+ \wxFFB1 \w71 \w80 43 \wx0010 00 // ENDTAKEOFF
+ 01
+ 00 00 00 00
+
+ // Metropolitan Airport : Position 0D
+ \w177 \w88 \w80 7F \wx00B0 00 // FLYING
+ 03
+ 7F 00 00 13
+ 44 40 00 0E
+ 54 44 00 19
+
+ // Metropolitan Airport : Position 0E
+ \w89 \w88 \w00 44 \wx0090 40 // LANDING
+ 01
+ 00 00 00 0F
+
+ // Metropolitan Airport : Position 0F
+ \w3 \w88 \w0 00 \wx0050 40
+ 01
+ 00 00 00 10
+
+ // Metropolitan Airport : Position 10
+ \w21 \w88 \w0 00 \wx000E 40
+ 01
+ 00 7E 44 46 7F 40 11 //leave landing runway for crossing
+
+ // Metropolitan Airport : Position 11
+ \w21 \w71 \w0 00 \wx0000 46
+ 01
+ 00 00 46 12 //leave outbound runway for inbound hold
+
+ // Metropolitan Airport : Position 12
+ \w21 \w57 \w0 45 \wx000B 44 // ENDLANDING. inbound hold position
+ 01
+ 00 42 44 07
+
+ // Metropolitan Airport : Position 13
+ \wxFFE1 \w193 \w80 00 \wx00B0 00
+ 01
+ 00 00 00 14
+
+ // Metropolitan Airport : Position 14
+ \w1 \w1 \w80 00 \wx00B0 00
+ 01
+ 00 00 00 15
+
+ // Metropolitan Airport : Position 15
+ \w257 \w1 \w80 00 \wx00B0 00
+ 01
+ 00 00 00 16
+
+ // Metropolitan Airport : Position 16
+ \w273 \w49 \w80 00 \wx00B0 00
+ 01
+ 00 00 00 0D
+
+ // Metropolitan Airport : Position 17
+ \w44 \w57 \w0 00 \wx0000 00
+ 01
+ 00 00 00 18
+
+ // Metropolitan Airport : Position 18
+ \w44 \w63 \w80 51 \wx0000 00 // HELITAKEOFF
+ 01
+ 00 00 00 00
+
+ // Metropolitan Airport : Position 19
+ \w15 \w57 \w80 54 \wx0030 44 // HELILANDING
+ 01
+ 00 44 00 1A
+
+ // Metropolitan Airport : Position 1A
+ \w15 \w57 \w0 55 \wx0000 44 // HELIENDLANDING
+ 01
+ 00 00 00 12
+
+// Prop1C Vehicle Entry Points
+ 1C 14 14 14 14
+
+// Prop1D Hangar/Depot Locations
+ 1D 01 05 00 01
+
+// Prop1E Terminal Groups
+ 1E 01 03
+
+// Prop20 Port Subtype
+ 20 03
+
+// Prop22 Catchment Area
+ 22 06
+
+//availability date varaction2
+//Metropolitan Airport available from 1980 (1920+60) to 2175 (1920+255)
+ 116 * 14 02 0D
+ 05 // ID
+ 81 01 // Variable 01 (current date)
+ 00 FF
+ 01
+ 01 FF 3C FF //1980-2175
+ 00 FF
+
+//!!Error (164): Offset 10: 13 is not a valid callback for this feature.
+ 117 * 14 02 0D
+ 06 // ID
+ 81 0C // Check variable 0C (callback id)
+ 00 FF
+ 01
+ 05 00 13 13 // Jump to action 2 ID 02 if this is callback 13
+ 00 00 // Otherwise return the real sprites
+
+ // Use graphics ID (1 station, ID 0, 0 cargo specific graphics, default cargo = 0)
+ 118 * 7 03 0D 01 01 00 06 00
+
+// Name
// Name
// Set the name of the station; all languages, 1 string, offset of CD 00, because 'generic strings' flag is set it's a word.
- 111 * 21 04 0D FF 01 00 CD "Small airports" 00
- 112 * 25 04 0D 9F 01 00 CD "Kleine vliegvelden" 00
- 113 * 23 04 0D FF 01 00 CE "Commuter airport" 00
- 114 * 22 04 0D 9F 01 00 CE "Pendelvliegveld" 00
-// 116 * 21 04 0D FF 01 01 CD "Large airports" 00
+ 119 * 21 04 0D FF 01 00 CD "Small airports" 00
+ 120 * 25 04 0D 9F 01 00 CD "Kleine vliegvelden" 00
+ 121 * 23 04 0D FF 01 00 CE "Commuter airport" 00
+ 122 * 22 04 0D 9F 01 00 CE "Pendelvliegveld" 00
+ 123 * 21 04 0D FF 01 01 CD "Large airports" 00
+ 124 * 27 04 0D FF 01 01 CE "Metropolitan Airport" 00
// 117 * 29 04 0D FF 01 02 CD "International airports" 00
// 118 * 16 04 0D FF 01 03 CD "Heliports" 00
Binary file bin/data/sprites/airportsextended.pcx has changed
--- a/src/openttd.cpp Wed Aug 15 10:30:49 2007 +0000
+++ b/src/openttd.cpp Wed Aug 15 21:09:34 2007 +0000
@@ -1515,6 +1515,11 @@
ResetAirportToNewGRFSpec(t, st, 0x5850414F, 0);
}
break;
+ case AT_METROPOLITAN:
+ {
+ ResetAirportToNewGRFSpec(t, st, 0x5850414F, 1);
+ }
+ break;
default:
break;
}