| author | tron |
| Wed, 13 Jul 2005 18:04:01 +0000 | |
| changeset 2049 | ad0d49c916d4 |
| parent 2008 | c9d6585c96c8 |
| child 2074 | f23dcde246da |
| permissions | -rw-r--r-- |
| 0 | 1 |
#include "stdafx.h" |
|
1891
92a3b0aa0946
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1785
diff
changeset
|
2 |
#include "openttd.h" |
|
2008
c9d6585c96c8
(svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
hackykid
parents:
1986
diff
changeset
|
3 |
#include "table/sprites.h" |
|
507
8aa8100b0b22
(svn r815) Include strings.h only in the files which need it.
tron
parents:
497
diff
changeset
|
4 |
#include "table/strings.h" |
|
679
e959706a3e4d
(svn r1117) Move map arrays and some related macros into their own files map.c and map.h
tron
parents:
541
diff
changeset
|
5 |
#include "map.h" |
|
1209
a1ac96655b79
(svn r1713) Split off several functions which query/set information about a single tile from map.h and put them into a seperate file tile.h
tron
parents:
1095
diff
changeset
|
6 |
#include "tile.h" |
| 0 | 7 |
#include "vehicle.h" |
8 |
#include "viewport.h" |
|
9 |
#include "command.h" |
|
10 |
#include "player.h" |
|
11 |
#include "town.h" |
|
12 |
#include "gfx.h" |
|
|
337
66647f97e7c0
(svn r513) Merge revisions 402, 416, 417, 478, 479, 511, 512 from map to trunk
tron
parents:
241
diff
changeset
|
13 |
#include "sound.h" |
|
1313
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1281
diff
changeset
|
14 |
#include "depot.h" |
|
2008
c9d6585c96c8
(svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
hackykid
parents:
1986
diff
changeset
|
15 |
#include "pbs.h" |
|
c9d6585c96c8
(svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
hackykid
parents:
1986
diff
changeset
|
16 |
#include "debug.h" |
| 0 | 17 |
|
| 22 | 18 |
/* When true, GetTrackStatus for roads will treat roads under reconstruction |
19 |
* as normal roads instead of impassable. This is used when detecting whether |
|
20 |
* a road can be removed. This is of course ugly, but I don't know a better |
|
21 |
* solution just like that... */ |
|
| 0 | 22 |
static bool _road_special_gettrackstatus; |
23 |
||
24 |
void RoadVehEnterDepot(Vehicle *v); |
|
25 |
||
26 |
||
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
27 |
static bool HasTileRoadAt(TileIndex tile, int i) |
| 0 | 28 |
{
|
29 |
int mask; |
|
30 |
byte b; |
|
31 |
||
|
1214
33e07bbb7779
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1209
diff
changeset
|
32 |
switch (GetTileType(tile)) {
|
| 0 | 33 |
case MP_STREET: |
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
34 |
b = _m[tile].m5; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
35 |
|
| 0 | 36 |
if ((b & 0xF0) == 0) {
|
|
1927
4126e0e3e884
(svn r2433) - CodeChange: unmagicify all road/train crossings with IsLevelCrossing() function (peter1138)
Darkvater
parents:
1902
diff
changeset
|
37 |
} else if (IsLevelCrossing(tile)) {
|
| 0 | 38 |
b = (b&8)?5:10; |
39 |
} else if ((b & 0xF0) == 0x20) {
|
|
40 |
return (~b & 3) == i; |
|
41 |
} else |
|
42 |
return false; |
|
43 |
break; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
44 |
|
| 0 | 45 |
case MP_STATION: |
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
46 |
b = _m[tile].m5; |
| 0 | 47 |
if (!IS_BYTE_INSIDE(b, 0x43, 0x43+8)) |
48 |
return false; |
|
49 |
return ((~(b - 0x43) & 3) == i); |
|
50 |
||
51 |
case MP_TUNNELBRIDGE: |
|
52 |
mask = GetRoadBitsByTile(tile); |
|
53 |
b = 10; if (mask & 1) break; |
|
54 |
b = 5; if (mask & 2) break; |
|
55 |
return false; |
|
56 |
||
57 |
default: |
|
58 |
return false; |
|
59 |
} |
|
60 |
||
61 |
return HASBIT(b, i); |
|
62 |
} |
|
63 |
||
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
64 |
static bool CheckAllowRemoveRoad(TileIndex tile, uint br, bool *edge_road) |
| 0 | 65 |
{
|
66 |
int blocks; |
|
67 |
byte owner; |
|
68 |
uint n; |
|
69 |
*edge_road = true; |
|
70 |
||
71 |
if (_game_mode == GM_EDITOR) |
|
72 |
return true; |
|
73 |
||
74 |
blocks = GetRoadBitsByTile(tile); |
|
75 |
if (blocks == 0) |
|
76 |
return true; |
|
77 |
||
78 |
// Only do the special processing for actual players. |
|
79 |
if (_current_player >= MAX_PLAYERS) |
|
80 |
return true; |
|
81 |
||
82 |
// A railway crossing has the road owner in the map3_lo byte. |
|
|
1927
4126e0e3e884
(svn r2433) - CodeChange: unmagicify all road/train crossings with IsLevelCrossing() function (peter1138)
Darkvater
parents:
1902
diff
changeset
|
83 |
if (IsTileType(tile, MP_STREET) && IsLevelCrossing(tile)) {
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
84 |
owner = _m[tile].m3; |
| 0 | 85 |
} else {
|
|
1901
fb05044cf5c3
(svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner
tron
parents:
1891
diff
changeset
|
86 |
owner = GetTileOwner(tile); |
| 0 | 87 |
} |
88 |
// Only do the special processing if the road is owned |
|
89 |
// by a town |
|
90 |
if (owner != OWNER_TOWN) {
|
|
91 |
return owner == OWNER_NONE || CheckOwnership(owner); |
|
92 |
} |
|
93 |
||
94 |
if (_cheats.magic_bulldozer.value) |
|
95 |
return true; |
|
96 |
||
97 |
// Get a bitmask of which neighbouring roads has a tile |
|
98 |
n = 0; |
|
99 |
if (blocks&0x25 && HasTileRoadAt(TILE_ADDXY(tile,-1, 0), 1)) n |= 8; |
|
100 |
if (blocks&0x2A && HasTileRoadAt(TILE_ADDXY(tile, 0, 1), 0)) n |= 4; |
|
101 |
if (blocks&0x19 && HasTileRoadAt(TILE_ADDXY(tile, 1, 0), 3)) n |= 2; |
|
102 |
if (blocks&0x16 && HasTileRoadAt(TILE_ADDXY(tile, 0,-1), 2)) n |= 1; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
103 |
|
| 0 | 104 |
// If 0 or 1 bits are set in n, or if no bits that match the bits to remove, |
105 |
// then allow it |
|
106 |
if ((n & (n-1)) != 0 && (n & br) != 0) {
|
|
107 |
Town *t; |
|
108 |
*edge_road = false; |
|
109 |
// you can remove all kind of roads with extra dynamite |
|
110 |
if (_patches.extra_dynamite) |
|
111 |
return true; |
|
112 |
||
|
1638
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
113 |
t = ClosestTownFromTile(tile, _patches.dist_local_authority); |
|
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
114 |
|
|
534
17ab2f22ff74
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
115 |
SetDParam(0, t->index); |
| 0 | 116 |
_error_message = STR_2009_LOCAL_AUTHORITY_REFUSES; |
117 |
return false; |
|
118 |
} |
|
119 |
||
120 |
return true; |
|
121 |
} |
|
122 |
||
123 |
uint GetRoadBitsByTile(TileIndex tile) |
|
124 |
{
|
|
|
159
139cf78bfb28
(svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs)
truelight
parents:
149
diff
changeset
|
125 |
uint32 r = GetTileTrackStatus(tile, TRANSPORT_ROAD); |
| 0 | 126 |
return (byte)(r | (r >> 8)); |
127 |
} |
|
128 |
||
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
129 |
/** Delete a piece of road. |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
130 |
* @param x,y tile coordinates for road construction |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
131 |
* @param p1 road piece flags |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
132 |
* @param p2 unused |
| 0 | 133 |
*/ |
134 |
int32 CmdRemoveRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
|
135 |
{
|
|
|
1638
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
136 |
// cost for removing inner/edge -roads |
|
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
137 |
static const uint16 road_remove_cost[2] = {50, 18};
|
|
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
138 |
|
| 0 | 139 |
TileInfo ti; |
140 |
int32 cost; |
|
|
1638
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
141 |
TileIndex tile; |
|
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
142 |
byte owner; |
| 0 | 143 |
Town *t; |
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
144 |
/* true if the roadpiece was always removeable, |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
145 |
* false if it was a center piece. Affects town ratings drop */ |
| 0 | 146 |
bool edge_road; |
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
147 |
byte pieces = (byte)p1; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
148 |
|
| 0 | 149 |
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); |
150 |
||
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
151 |
/* Road pieces are max 4 bitset values (NE, NW, SE, SW) */ |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
152 |
if (pieces >> 4) return CMD_ERROR; |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
153 |
|
| 0 | 154 |
FindLandscapeHeight(&ti, x, y); |
155 |
tile = ti.tile; |
|
|
1638
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
156 |
|
|
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
157 |
// owner for railraod crossing is stored somewhere else |
|
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
158 |
// XXX - Fix this so for a given tiletype the owner of the type is in the same variable |
|
1927
4126e0e3e884
(svn r2433) - CodeChange: unmagicify all road/train crossings with IsLevelCrossing() function (peter1138)
Darkvater
parents:
1902
diff
changeset
|
159 |
if (IsTileType(tile, MP_STREET) && IsLevelCrossing(tile)) {
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
160 |
owner = _m[tile].m3; |
|
1638
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
161 |
} else |
|
1901
fb05044cf5c3
(svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner
tron
parents:
1891
diff
changeset
|
162 |
owner = GetTileOwner(tile); |
|
1638
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
163 |
|
|
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
164 |
if (owner == OWNER_TOWN && _game_mode != GM_EDITOR) {
|
|
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
165 |
if (IsTileType(tile, MP_TUNNELBRIDGE)) { // index of town is not saved for bridge (no space)
|
|
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
166 |
t = ClosestTownFromTile(tile, _patches.dist_local_authority); |
|
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
167 |
} else |
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
168 |
t = GetTown(_m[tile].m2); |
|
1638
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
169 |
} else |
|
1280
b6925875de49
(svn r1784) -Fix: removed ClosestTownFromTile where possible, or replaced it
truelight
parents:
1264
diff
changeset
|
170 |
t = NULL; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
171 |
|
| 0 | 172 |
// allow deleting road under bridge |
173 |
if (ti.type != MP_TUNNELBRIDGE && !EnsureNoVehicle(tile)) |
|
174 |
return CMD_ERROR; |
|
175 |
||
176 |
{
|
|
177 |
bool b; |
|
178 |
_road_special_gettrackstatus = true; |
|
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
179 |
b = CheckAllowRemoveRoad(tile, pieces, &edge_road); |
| 0 | 180 |
_road_special_gettrackstatus = false; |
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
181 |
if (!b) return CMD_ERROR; |
| 0 | 182 |
} |
183 |
||
184 |
if (ti.type == MP_TUNNELBRIDGE) {
|
|
|
1041
be151b7bc909
(svn r1542) Rename TileHeight to TilePixelHeight, because this is what it actually returns
tron
parents:
1035
diff
changeset
|
185 |
if (!EnsureNoVehicleZ(tile, TilePixelHeight(tile))) |
| 0 | 186 |
return CMD_ERROR; |
187 |
||
188 |
if ((ti.map5 & 0xE9) == 0xE8) {
|
|
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
189 |
if (pieces & 10) goto return_error; |
| 0 | 190 |
} else if ((ti.map5 & 0xE9) == 0xE9) {
|
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
191 |
if (pieces & 5) goto return_error; |
| 0 | 192 |
} else |
193 |
goto return_error; |
|
194 |
||
195 |
cost = _price.remove_road * 2; |
|
196 |
||
197 |
if (flags & DC_EXEC) {
|
|
|
1638
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
198 |
ChangeTownRating(t, -road_remove_cost[(byte)edge_road], RATING_ROAD_MINIMUM); |
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
199 |
_m[tile].m5 = ti.map5 & 0xC7; |
| 1902 | 200 |
SetTileOwner(tile, OWNER_NONE); |
| 0 | 201 |
MarkTileDirtyByTile(tile); |
202 |
} |
|
203 |
return cost; |
|
204 |
} else if (ti.type == MP_STREET) {
|
|
|
1638
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
205 |
// check if you're allowed to remove the street owned by a town |
|
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
206 |
// removal allowance depends on difficulty setting |
|
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
207 |
if (!CheckforTownRating(tile, flags, t, ROAD_REMOVE)) return CMD_ERROR; |
|
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
208 |
|
|
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
209 |
// XXX - change cascading ifs to switch when doing rewrite |
|
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
210 |
if ((ti.map5 & 0xF0) == 0) { // normal road
|
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
211 |
byte c = pieces, t2; |
| 0 | 212 |
|
213 |
if (ti.tileh != 0 && (ti.map5 == 5 || ti.map5 == 10)) {
|
|
214 |
c |= (c & 0xC) >> 2; |
|
215 |
c |= (c & 0x3) << 2; |
|
216 |
} |
|
217 |
||
218 |
// limit the bits to delete to the existing bits. |
|
219 |
if ((c &= ti.map5) == 0) goto return_error; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
220 |
|
| 0 | 221 |
// calculate the cost |
222 |
t2 = c; |
|
223 |
cost = 0; |
|
224 |
do {
|
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
225 |
if (t2&1) cost += _price.remove_road; |
| 0 | 226 |
} while(t2>>=1); |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
227 |
|
| 0 | 228 |
if (flags & DC_EXEC) {
|
|
1638
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
229 |
ChangeTownRating(t, -road_remove_cost[(byte)edge_road], RATING_ROAD_MINIMUM); |
| 0 | 230 |
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
231 |
_m[tile].m5 ^= c; |
|
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
232 |
if ((_m[tile].m5&0xF) == 0) |
| 0 | 233 |
DoClearSquare(tile); |
234 |
else |
|
235 |
MarkTileDirtyByTile(tile); |
|
236 |
||
237 |
} |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
238 |
return cost; |
|
1638
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
239 |
} else if ((ti.map5 & 0xE0) == 0) { // railroad crossing
|
| 0 | 240 |
byte c; |
241 |
||
242 |
if (!(ti.map5 & 8)) {
|
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
243 |
c = 2; |
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
244 |
if (pieces & 5) goto return_error; |
| 0 | 245 |
} else {
|
246 |
c = 1; |
|
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
247 |
if (pieces & 10) goto return_error; |
| 0 | 248 |
} |
249 |
||
250 |
cost = _price.remove_road * 2; |
|
251 |
if (flags & DC_EXEC) {
|
|
|
2008
c9d6585c96c8
(svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
hackykid
parents:
1986
diff
changeset
|
252 |
byte pbs_track = PBSTileReserved(tile); |
|
1638
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
253 |
ChangeTownRating(t, -road_remove_cost[(byte)edge_road], RATING_ROAD_MINIMUM); |
|
aae181b00846
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
Darkvater
parents:
1398
diff
changeset
|
254 |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
255 |
ModifyTile(tile, |
| 0 | 256 |
MP_SETTYPE(MP_RAILWAY) | |
257 |
MP_MAP2_CLEAR | MP_MAP3LO | MP_MAP3HI_CLEAR | MP_MAP5, |
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
258 |
_m[tile].m4 & 0xF, /* map3_lo */ |
| 0 | 259 |
c /* map5 */ |
260 |
); |
|
|
2008
c9d6585c96c8
(svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
hackykid
parents:
1986
diff
changeset
|
261 |
if (pbs_track != 0) |
|
c9d6585c96c8
(svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
hackykid
parents:
1986
diff
changeset
|
262 |
PBSReserveTrack(tile, FIND_FIRST_BIT(pbs_track)); |
| 0 | 263 |
} |
264 |
return cost; |
|
265 |
} else |
|
266 |
goto return_error; |
|
267 |
||
268 |
} else {
|
|
269 |
return_error:; |
|
270 |
return_cmd_error(INVALID_STRING_ID); |
|
271 |
} |
|
272 |
} |
|
273 |
||
274 |
||
275 |
enum {
|
|
276 |
ROAD_NW = 1, // NW road track |
|
277 |
ROAD_SW = 2, // SW road track |
|
278 |
ROAD_SE = 4, // SE road track |
|
279 |
ROAD_NE = 8, // NE road track |
|
280 |
ROAD_ALL = (ROAD_NW | ROAD_SW | ROAD_SE | ROAD_NE) |
|
281 |
}; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
282 |
|
|
13
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
283 |
static const byte _valid_tileh_slopes_road[3][15] = {
|
| 0 | 284 |
// set of normal ones |
285 |
{
|
|
286 |
ROAD_ALL, 0, 0, |
|
287 |
ROAD_SW | ROAD_NE, 0, 0, // 3, 4, 5 |
|
288 |
ROAD_NW | ROAD_SE, 0, 0, |
|
289 |
ROAD_NW | ROAD_SE, 0, 0, // 9, 10, 11 |
|
290 |
ROAD_SW | ROAD_NE, 0, 0 |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
291 |
}, |
| 0 | 292 |
// allowed road for an evenly raised platform |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
293 |
{
|
| 0 | 294 |
0, |
295 |
ROAD_SW | ROAD_NW, |
|
296 |
ROAD_SW | ROAD_SE, |
|
297 |
ROAD_NW | ROAD_SE | ROAD_SW, |
|
298 |
||
299 |
ROAD_SE | ROAD_NE, // 4 |
|
300 |
ROAD_ALL, |
|
301 |
ROAD_SW | ROAD_NE | ROAD_SE, |
|
302 |
ROAD_ALL, |
|
303 |
||
304 |
ROAD_NW | ROAD_NE, // 8 |
|
305 |
ROAD_SW | ROAD_NE | ROAD_NW, |
|
306 |
ROAD_ALL, |
|
307 |
ROAD_ALL, |
|
308 |
||
309 |
ROAD_NW | ROAD_SE | ROAD_NE, // 12 |
|
310 |
ROAD_ALL, |
|
311 |
ROAD_ALL |
|
|
13
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
312 |
}, |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
313 |
// valid railway crossings on slopes |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
314 |
{
|
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
315 |
1, 0, 0, // 0, 1, 2 |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
316 |
0, 0, 1, // 3, 4, 5 |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
317 |
0, 1, 0, // 6, 7, 8 |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
318 |
0, 1, 1, // 9, 10, 11 |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
319 |
0, 1, 1, // 12, 13, 14 |
| 0 | 320 |
} |
321 |
}; |
|
322 |
||
323 |
||
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
324 |
static uint32 CheckRoadSlope(int tileh, byte *pieces, byte existing) |
| 0 | 325 |
{
|
326 |
if (!(tileh & 0x10)) {
|
|
327 |
byte road_bits = *pieces | existing; |
|
328 |
||
329 |
// no special foundation |
|
330 |
if ((~_valid_tileh_slopes_road[0][tileh] & road_bits) == 0) {
|
|
331 |
// force that all bits are set when we have slopes |
|
332 |
if (tileh != 0) *pieces |= _valid_tileh_slopes_road[0][tileh]; |
|
333 |
return 0; // no extra cost |
|
334 |
} |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
335 |
|
| 0 | 336 |
// foundation is used. Whole tile is leveled up |
337 |
if ((~_valid_tileh_slopes_road[1][tileh] & road_bits) == 0) {
|
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
338 |
return existing ? 0 : _price.terraform; |
| 0 | 339 |
} |
340 |
||
341 |
// partly leveled up tile, only if there's no road on that tile |
|
342 |
if ( !existing && (tileh == 1 || tileh == 2 || tileh == 4 || tileh == 8) ) {
|
|
343 |
// force full pieces. |
|
344 |
*pieces |= (*pieces & 0xC) >> 2; |
|
345 |
*pieces |= (*pieces & 0x3) << 2; |
|
|
72
24bdf837198c
(svn r73) -Fix: Wrong building of road-slopes for a future AI/Town
darkvater
parents:
39
diff
changeset
|
346 |
return (*pieces == (ROAD_NE|ROAD_SW) || *pieces == (ROAD_SE|ROAD_NW)) ? _price.terraform : CMD_ERROR; |
| 0 | 347 |
} |
348 |
} |
|
349 |
return CMD_ERROR; |
|
350 |
} |
|
351 |
||
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
352 |
/** Build a piece of road. |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
353 |
* @param x,y tile coordinates for road construction |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
354 |
* @param p1 road piece flags |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
355 |
* @param p2 the town that is building the road (0 if not applicable) |
| 0 | 356 |
*/ |
357 |
int32 CmdBuildRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
|
358 |
{
|
|
359 |
TileInfo ti; |
|
360 |
int32 cost; |
|
361 |
byte pieces = (byte)p1, existing = 0; |
|
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
362 |
TileIndex tile; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
363 |
|
| 0 | 364 |
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); |
365 |
||
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
366 |
/* Road pieces are max 4 bitset values (NE, NW, SE, SW) and town can only be non-zero |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
367 |
* if a non-player is building the road */ |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
368 |
if ((pieces >> 4) || (_current_player < MAX_PLAYERS && p2 != 0) || !IsTownIndex(p2)) return CMD_ERROR; |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
369 |
|
| 0 | 370 |
FindLandscapeHeight(&ti, x, y); |
371 |
tile = ti.tile; |
|
372 |
||
373 |
// allow building road under bridge |
|
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
374 |
if (ti.type != MP_TUNNELBRIDGE && !EnsureNoVehicle(tile)) return CMD_ERROR; |
| 0 | 375 |
|
376 |
if (ti.type == MP_STREET) {
|
|
377 |
if (!(ti.map5 & 0xF0)) {
|
|
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
378 |
if ( (pieces & (byte)(ti.map5)) == (pieces)) |
| 0 | 379 |
return_cmd_error(STR_1007_ALREADY_BUILT); |
380 |
existing = ti.map5; |
|
381 |
} else {
|
|
382 |
if (!(ti.map5 & 0xE0) && pieces != ((ti.map5 & 8) ? 5 : 10)) |
|
383 |
return_cmd_error(STR_1007_ALREADY_BUILT); |
|
384 |
goto do_clear; |
|
385 |
} |
|
386 |
} else if (ti.type == MP_RAILWAY) {
|
|
387 |
byte m5; |
|
388 |
||
|
13
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
389 |
if (ti.tileh & 0x10) // very steep tile |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
390 |
return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION); |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
391 |
|
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
392 |
if(!_valid_tileh_slopes_road[2][ti.tileh]) // prevent certain slopes |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
393 |
return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION); |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
394 |
|
| 0 | 395 |
if (ti.map5 == 2) {
|
396 |
if (pieces & 5) goto do_clear; |
|
397 |
m5 = 0x10; |
|
398 |
} else if (ti.map5 == 1) {
|
|
399 |
if (pieces & 10) goto do_clear; |
|
400 |
m5 = 0x18; |
|
401 |
} else |
|
402 |
goto do_clear; |
|
403 |
||
404 |
if (flags & DC_EXEC) {
|
|
|
2008
c9d6585c96c8
(svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
hackykid
parents:
1986
diff
changeset
|
405 |
byte pbs_track = PBSTileReserved(tile); |
| 0 | 406 |
ModifyTile(tile, |
407 |
MP_SETTYPE(MP_STREET) | |
|
|
1264
280792016b02
(svn r1768) -Codechange: Store town index in _map2 of town tiles
celestar
parents:
1247
diff
changeset
|
408 |
MP_MAP2 | MP_MAP3LO | MP_MAP3HI | MP_MAP5, |
|
280792016b02
(svn r1768) -Codechange: Store town index in _map2 of town tiles
celestar
parents:
1247
diff
changeset
|
409 |
p2, |
| 0 | 410 |
_current_player, /* map3_lo */ |
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
411 |
_m[tile].m3 & 0xF, /* map3_hi */ |
| 0 | 412 |
m5 /* map5 */ |
413 |
); |
|
|
2008
c9d6585c96c8
(svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
hackykid
parents:
1986
diff
changeset
|
414 |
if (pbs_track != 0) |
|
c9d6585c96c8
(svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
hackykid
parents:
1986
diff
changeset
|
415 |
PBSReserveTrack(tile, FIND_FIRST_BIT(pbs_track)); |
| 0 | 416 |
} |
417 |
return _price.build_road * 2; |
|
418 |
} else if (ti.type == MP_TUNNELBRIDGE) {
|
|
419 |
||
420 |
/* check for flat land */ |
|
|
13
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
421 |
if (ti.tileh & 0x10) // very steep tile |
| 0 | 422 |
return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION); |
423 |
||
424 |
/* is this middle part of a bridge? */ |
|
425 |
if ((ti.map5 & 0xC0) != 0xC0) |
|
426 |
goto do_clear; |
|
427 |
||
428 |
/* only allow roads pertendicular to bridge */ |
|
|
959
b031d88c76f3
(svn r1451) Fix some of the signed/unsigned comparison warnings
tron
parents:
926
diff
changeset
|
429 |
if ((pieces & 5U) == (ti.map5 & 0x01U)) |
| 0 | 430 |
goto do_clear; |
431 |
||
432 |
/* check if clear land under bridge */ |
|
433 |
if ((ti.map5 & 0xF8) == 0xE8) /* road under bridge */ |
|
434 |
return_cmd_error(STR_1007_ALREADY_BUILT); |
|
435 |
else if ((ti.map5 & 0xE0) == 0xE0) /* other transport route under bridge */ |
|
436 |
return_cmd_error(STR_1008_MUST_REMOVE_RAILROAD_TRACK); |
|
437 |
else if ((ti.map5 & 0xF8) == 0xC8) /* water under bridge */ |
|
438 |
return_cmd_error(STR_3807_CAN_T_BUILD_ON_WATER); |
|
439 |
||
440 |
/* all checked, can build road now! */ |
|
441 |
cost = _price.build_road * 2; |
|
442 |
if (flags & DC_EXEC) {
|
|
443 |
ModifyTile(tile, |
|
444 |
MP_MAPOWNER_CURRENT | MP_MAP5, |
|
445 |
(ti.map5 & 0xC7) | 0x28 // map5 |
|
446 |
); |
|
447 |
} |
|
448 |
return cost; |
|
449 |
} else {
|
|
450 |
do_clear:; |
|
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
451 |
if (CmdFailed(DoCommandByTile(tile, 0, 0, flags & ~DC_EXEC, CMD_LANDSCAPE_CLEAR))) |
| 0 | 452 |
return CMD_ERROR; |
453 |
} |
|
454 |
||
455 |
cost = CheckRoadSlope(ti.tileh, &pieces, existing); |
|
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
456 |
if (CmdFailed(cost)) return_cmd_error(STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION); |
| 0 | 457 |
|
|
84
1e0721c29bad
(svn r85) -Add: initial commit of new AI (enable in Patch menu)
truelight
parents:
72
diff
changeset
|
458 |
if (cost && (!_patches.build_on_slopes || (!_patches.ainew_active && _is_ai_player))) |
| 0 | 459 |
return CMD_ERROR; |
460 |
||
461 |
if (!(ti.type == MP_STREET && (ti.map5 & 0xF0) == 0)) {
|
|
462 |
cost += DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR); |
|
463 |
} else {
|
|
464 |
// Don't put the pieces that already exist |
|
465 |
pieces &= ~ti.map5; |
|
466 |
} |
|
467 |
||
468 |
{
|
|
469 |
byte t = pieces; |
|
470 |
while (t) {
|
|
471 |
if (t & 1) cost += _price.build_road; |
|
472 |
t >>= 1; |
|
473 |
} |
|
474 |
} |
|
475 |
||
476 |
if (flags & DC_EXEC) {
|
|
477 |
if (ti.type != MP_STREET) {
|
|
|
1059
c28c6be74291
(svn r1560) Introduce SetTileType() and SetTileHeight()
tron
parents:
1041
diff
changeset
|
478 |
SetTileType(tile, MP_STREET); |
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
479 |
_m[tile].m5 = 0; |
|
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
480 |
_m[tile].m2 = p2; |
| 1902 | 481 |
SetTileOwner(tile, _current_player); |
| 0 | 482 |
} |
483 |
||
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
484 |
_m[tile].m5 |= (byte)pieces; |
| 0 | 485 |
|
486 |
MarkTileDirtyByTile(tile); |
|
487 |
} |
|
488 |
return cost; |
|
489 |
} |
|
490 |
||
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
491 |
int32 DoConvertStreetRail(TileIndex tile, uint totype, bool exec) |
| 0 | 492 |
{
|
493 |
// not a railroad crossing? |
|
|
1927
4126e0e3e884
(svn r2433) - CodeChange: unmagicify all road/train crossings with IsLevelCrossing() function (peter1138)
Darkvater
parents:
1902
diff
changeset
|
494 |
if (!IsLevelCrossing(tile)) return CMD_ERROR; |
| 0 | 495 |
|
496 |
// not owned by me? |
|
497 |
if (!CheckTileOwnership(tile) || !EnsureNoVehicle(tile)) return CMD_ERROR; |
|
498 |
||
499 |
// tile is already of requested type? |
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
500 |
if ( (uint)(_m[tile].m4 & 0xF) == totype) return CMD_ERROR; |
| 0 | 501 |
|
502 |
if (exec) {
|
|
503 |
// change type. |
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
504 |
_m[tile].m4 = (_m[tile].m4 & 0xF0) + totype; |
| 0 | 505 |
MarkTileDirtyByTile(tile); |
506 |
} |
|
507 |
||
508 |
return _price.build_rail >> 1; |
|
509 |
} |
|
510 |
||
511 |
||
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
512 |
/** Build a long piece of road. |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
513 |
* @param x,y end tile of drag |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
514 |
* @param p1 start tile of drag |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
515 |
* @param p2 various bitstuffed elements |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
516 |
* - p2 = (bit 0) - start tile starts in the 2nd half of tile (p2 & 1) |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
517 |
* - p2 = (bit 1) - end tile starts in the 2nd half of tile (p2 & 2) |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
518 |
* - p2 = (bit 2) - direction: 0 = along x-axis, 1 = along y-axis (p2 & 4) |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
519 |
*/ |
| 0 | 520 |
int32 CmdBuildLongRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
521 |
{
|
|
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
522 |
TileIndex start_tile, end_tile, tile; |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
523 |
int32 cost, ret; |
| 0 | 524 |
|
|
889
7f8630bfea41
(svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky.
darkvater
parents:
817
diff
changeset
|
525 |
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); |
|
7f8630bfea41
(svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky.
darkvater
parents:
817
diff
changeset
|
526 |
|
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
527 |
if (p1 > MapSize()) return CMD_ERROR; |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
528 |
|
| 0 | 529 |
start_tile = p1; |
|
1980
9ea0c89fbb58
(svn r2486) Turn TILE_FROM_XY into an inline function and rename it to TileVirtXY
tron
parents:
1979
diff
changeset
|
530 |
end_tile = TileVirtXY(x, y); |
| 0 | 531 |
|
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
532 |
/* Only drag in X or Y direction dictated by the direction variable */ |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
533 |
if (!HASBIT(p2, 2) && TileY(start_tile) != TileY(end_tile)) return CMD_ERROR; // x-axis |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
534 |
if (HASBIT(p2, 2) && TileX(start_tile) != TileX(end_tile)) return CMD_ERROR; // y-axis |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
535 |
|
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
536 |
/* Swap start and ending tile, also the half-tile drag var (bit 0 and 1) */ |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
537 |
if (start_tile > end_tile || (start_tile == end_tile && HASBIT(p2, 0))) {
|
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
538 |
TileIndex t = start_tile; |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
539 |
start_tile = end_tile; |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
540 |
end_tile = t; |
| 0 | 541 |
p2 ^= IS_INT_INSIDE(p2&3, 1, 3) ? 3 : 0; |
542 |
} |
|
543 |
||
544 |
cost = 0; |
|
545 |
tile = start_tile; |
|
546 |
// Start tile is the small number. |
|
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
547 |
for (;;) {
|
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
548 |
uint bits = HASBIT(p2, 2) ? ROAD_SE | ROAD_NW : ROAD_SW | ROAD_NE; |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
549 |
if (tile == end_tile && !HASBIT(p2, 1)) bits &= ROAD_NW | ROAD_NE; |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
550 |
if (tile == start_tile && HASBIT(p2, 0)) bits &= ROAD_SE | ROAD_SW; |
| 0 | 551 |
|
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
552 |
ret = DoCommandByTile(tile, bits, 0, flags, CMD_BUILD_ROAD); |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
553 |
if (CmdFailed(ret)) {
|
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
554 |
if (_error_message != STR_1007_ALREADY_BUILT) return CMD_ERROR; |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
555 |
} else |
| 0 | 556 |
cost += ret; |
557 |
||
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
558 |
if (tile == end_tile) break; |
| 0 | 559 |
|
| 1981 | 560 |
tile += HASBIT(p2, 2) ? TileDiffXY(0, 1) : TileDiffXY(1, 0); |
| 0 | 561 |
} |
562 |
||
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
563 |
return (cost == 0) ? CMD_ERROR : cost; |
| 0 | 564 |
} |
565 |
||
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
566 |
/** Remove a long piece of road. |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
567 |
* @param x,y end tile of drag |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
568 |
* @param p1 start tile of drag |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
569 |
* @param p2 various bitstuffed elements |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
570 |
* - p2 = (bit 0) - start tile starts in the 2nd half of tile (p2 & 1) |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
571 |
* - p2 = (bit 1) - end tile starts in the 2nd half of tile (p2 & 2) |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
572 |
* - p2 = (bit 2) - direction: 0 = along x-axis, 1 = along y-axis (p2 & 4) |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
573 |
*/ |
| 0 | 574 |
int32 CmdRemoveLongRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
575 |
{
|
|
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
576 |
TileIndex start_tile, end_tile, tile; |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
577 |
int32 cost, ret; |
| 0 | 578 |
|
|
889
7f8630bfea41
(svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky.
darkvater
parents:
817
diff
changeset
|
579 |
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); |
|
7f8630bfea41
(svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky.
darkvater
parents:
817
diff
changeset
|
580 |
|
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
581 |
if (p1 > MapSize()) return CMD_ERROR; |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
582 |
|
| 0 | 583 |
start_tile = p1; |
|
1980
9ea0c89fbb58
(svn r2486) Turn TILE_FROM_XY into an inline function and rename it to TileVirtXY
tron
parents:
1979
diff
changeset
|
584 |
end_tile = TileVirtXY(x, y); |
| 0 | 585 |
|
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
586 |
/* Only drag in X or Y direction dictated by the direction variable */ |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
587 |
if (!HASBIT(p2, 2) && TileY(start_tile) != TileY(end_tile)) return CMD_ERROR; // x-axis |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
588 |
if (HASBIT(p2, 2) && TileX(start_tile) != TileX(end_tile)) return CMD_ERROR; // y-axis |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
589 |
|
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
590 |
/* Swap start and ending tile, also the half-tile drag var (bit 0 and 1) */ |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
591 |
if (start_tile > end_tile || (start_tile == end_tile && HASBIT(p2, 0))) {
|
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
592 |
TileIndex t = start_tile; |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
593 |
start_tile = end_tile; |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
594 |
end_tile = t; |
| 0 | 595 |
p2 ^= IS_INT_INSIDE(p2&3, 1, 3) ? 3 : 0; |
596 |
} |
|
597 |
||
598 |
cost = 0; |
|
599 |
tile = start_tile; |
|
600 |
// Start tile is the small number. |
|
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
601 |
for (;;) {
|
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
602 |
uint bits = HASBIT(p2, 2) ? ROAD_SE | ROAD_NW : ROAD_SW | ROAD_NE; |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
603 |
if (tile == end_tile && !HASBIT(p2, 1)) bits &= ROAD_NW | ROAD_NE; |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
604 |
if (tile == start_tile && HASBIT(p2, 0)) bits &= ROAD_SE | ROAD_SW; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
605 |
|
| 0 | 606 |
// try to remove the halves. |
607 |
if (bits) {
|
|
608 |
ret = DoCommandByTile(tile, bits, 0, flags, CMD_REMOVE_ROAD); |
|
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
609 |
if (!CmdFailed(ret)) cost += ret; |
| 0 | 610 |
} |
611 |
||
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
612 |
if (tile == end_tile) break; |
| 0 | 613 |
|
| 1981 | 614 |
tile += HASBIT(p2, 2) ? TileDiffXY(0, 1) : TileDiffXY(1, 0); |
| 0 | 615 |
} |
616 |
||
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
617 |
return (cost == 0) ? CMD_ERROR : cost; |
| 0 | 618 |
} |
619 |
||
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
620 |
/** Build a road depot. |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
621 |
* @param x,y tile coordinates where the depot will be built |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
622 |
* @param p1 depot direction (0 through 3), where 0 is NW, 1 is NE, etc. |
|
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
623 |
* @param p2 unused |
| 0 | 624 |
*/ |
625 |
int32 CmdBuildRoadDepot(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
|
626 |
{
|
|
627 |
TileInfo ti; |
|
628 |
int32 cost; |
|
629 |
Depot *dep; |
|
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
630 |
TileIndex tile; |
| 0 | 631 |
|
632 |
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); |
|
633 |
||
|
1785
998f4b5eec29
(svn r2289) - Fix (regression): check p1 param of road-depot building instead of unused p2 (typo). Thanks peter1138.
Darkvater
parents:
1784
diff
changeset
|
634 |
if (p1 > 3) return CMD_ERROR; // check direction |
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
635 |
|
| 0 | 636 |
FindLandscapeHeight(&ti, x, y); |
637 |
||
638 |
tile = ti.tile; |
|
639 |
||
640 |
if (!EnsureNoVehicle(tile)) |
|
641 |
return CMD_ERROR; |
|
642 |
||
643 |
if (ti.tileh != 0) {
|
|
|
84
1e0721c29bad
(svn r85) -Add: initial commit of new AI (enable in Patch menu)
truelight
parents:
72
diff
changeset
|
644 |
if (!_patches.build_on_slopes || (ti.tileh & 0x10 || !((0x4C >> p1) & ti.tileh) )) |
| 0 | 645 |
return_cmd_error(STR_0007_FLAT_LAND_REQUIRED); |
646 |
} |
|
647 |
||
648 |
cost = DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR); |
|
|
1784
6eb3ab1bc33c
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
649 |
if (CmdFailed(cost)) return CMD_ERROR; |
| 0 | 650 |
|
651 |
dep = AllocateDepot(); |
|
652 |
if (dep == NULL) |
|
653 |
return CMD_ERROR; |
|
654 |
||
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
655 |
if (flags & DC_EXEC) {
|
|
1986
5dd3db2b86d7
(svn r2492) Remove some pointless casts and fix some nearby indentation
tron
parents:
1981
diff
changeset
|
656 |
if (_current_player == _local_player) _last_built_road_depot_tile = tile; |
| 0 | 657 |
|
658 |
dep->xy = tile; |
|
659 |
dep->town_index = ClosestTownFromTile(tile, (uint)-1)->index; |
|
660 |
||
661 |
ModifyTile(tile, |
|
662 |
MP_SETTYPE(MP_STREET) | |
|
663 |
MP_MAPOWNER_CURRENT | MP_MAP5, |
|
664 |
(p1 | 0x20) /* map5 */ |
|
665 |
); |
|
666 |
||
667 |
} |
|
668 |
return cost + _price.build_road_depot; |
|
669 |
} |
|
670 |
||
|
1979
f4462d4e8e62
(svn r2485) Missed two uint -> TileIndex, thanks _Luca_
tron
parents:
1977
diff
changeset
|
671 |
static int32 RemoveRoadDepot(TileIndex tile, uint32 flags) |
| 0 | 672 |
{
|
|
149
5f7d4b21df01
(svn r150) -Fix: [1010833] Turning on the magic bulldozer removes oil rigs
darkvater
parents:
84
diff
changeset
|
673 |
if (!CheckTileOwnership(tile) && _current_player != OWNER_WATER) |
| 0 | 674 |
return CMD_ERROR; |
675 |
||
676 |
if (!EnsureNoVehicle(tile)) |
|
677 |
return CMD_ERROR; |
|
678 |
||
679 |
if (flags & DC_EXEC) {
|
|
680 |
DoDeleteDepot(tile); |
|
681 |
} |
|
682 |
||
683 |
return _price.remove_road_depot; |
|
684 |
} |
|
685 |
||
686 |
#define M(x) (1<<(x)) |
|
687 |
||
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
688 |
static int32 ClearTile_Road(TileIndex tile, byte flags) |
|
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
689 |
{
|
| 0 | 690 |
int32 ret; |
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
691 |
byte m5 = _m[tile].m5; |
| 0 | 692 |
|
693 |
if ( (m5 & 0xF0) == 0) {
|
|
694 |
byte b = m5 & 0xF; |
|
695 |
||
696 |
if (! ((1 << b) & (M(1)|M(2)|M(4)|M(8))) ) {
|
|
|
1901
fb05044cf5c3
(svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner
tron
parents:
1891
diff
changeset
|
697 |
if ((!(flags & DC_AI_BUILDING) || !IsTileOwner(tile, OWNER_TOWN)) && flags & DC_AUTO) |
| 0 | 698 |
return_cmd_error(STR_1801_MUST_REMOVE_ROAD_FIRST); |
699 |
} |
|
700 |
return DoCommandByTile(tile, b, 0, flags, CMD_REMOVE_ROAD); |
|
701 |
} else if ( (m5 & 0xE0) == 0) {
|
|
702 |
if (flags & DC_AUTO) |
|
703 |
return_cmd_error(STR_1801_MUST_REMOVE_ROAD_FIRST); |
|
704 |
||
705 |
ret = DoCommandByTile(tile, (m5&8)?5:10, 0, flags, CMD_REMOVE_ROAD); |
|
706 |
if (ret == CMD_ERROR) |
|
707 |
return CMD_ERROR; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
708 |
|
| 0 | 709 |
if (flags & DC_EXEC) {
|
710 |
DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR); |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
711 |
} |
| 0 | 712 |
|
713 |
return ret; |
|
714 |
} else {
|
|
715 |
if (flags & DC_AUTO) |
|
716 |
return_cmd_error(STR_2004_BUILDING_MUST_BE_DEMOLISHED); |
|
717 |
return RemoveRoadDepot(tile,flags); |
|
718 |
} |
|
719 |
} |
|
720 |
||
721 |
||
722 |
typedef struct DrawRoadTileStruct {
|
|
723 |
uint16 image; |
|
724 |
byte subcoord_x; |
|
725 |
byte subcoord_y; |
|
726 |
} DrawRoadTileStruct; |
|
727 |
||
728 |
typedef struct DrawRoadSeqStruct {
|
|
729 |
uint32 image; |
|
730 |
byte subcoord_x; |
|
731 |
byte subcoord_y; |
|
732 |
byte width; |
|
733 |
byte height; |
|
734 |
} DrawRoadSeqStruct; |
|
735 |
||
736 |
#include "table/road_land.h" |
|
737 |
||
738 |
||
|
84
1e0721c29bad
(svn r85) -Add: initial commit of new AI (enable in Patch menu)
truelight
parents:
72
diff
changeset
|
739 |
uint GetRoadFoundation(uint tileh, uint bits) {
|
| 0 | 740 |
int i; |
741 |
// normal level sloped building |
|
742 |
if ((~_valid_tileh_slopes_road[1][tileh] & bits) == 0) |
|
743 |
return tileh; |
|
744 |
||
745 |
// inclined sloped building |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
746 |
if ( ((i=0, tileh == 1) || (i+=2, tileh == 2) || (i+=2, tileh == 4) || (i+=2, tileh == 8)) && |
| 0 | 747 |
((bits == (ROAD_SW | ROAD_NE)) || (i++, bits == (ROAD_NW | ROAD_SE)))) |
748 |
return i + 15; |
|
749 |
||
|
13
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
750 |
// rail crossing |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
751 |
if ((bits & 0x10) && _valid_tileh_slopes_road[2][tileh]) |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
752 |
return tileh; |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
753 |
|
| 0 | 754 |
return 0; |
755 |
} |
|
756 |
||
757 |
const byte _road_sloped_sprites[14] = {
|
|
758 |
0, 0, 2, 0, |
|
759 |
0, 1, 0, 0, |
|
760 |
3, 0, 0, 0, |
|
761 |
0, 0 |
|
762 |
}; |
|
763 |
||
764 |
static void DrawTile_Road(TileInfo *ti) |
|
765 |
{
|
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
766 |
uint32 image; |
|
817
4f9377b7fd2b
(svn r1288) -Codechange: changed _map2 to an uint16. It is still saved and loaded as
truelight
parents:
679
diff
changeset
|
767 |
uint16 m2; |
| 0 | 768 |
|
769 |
if ( (ti->map5 & 0xF0) == 0) { // if it is a road the upper 4 bits are 0
|
|
770 |
const DrawRoadTileStruct *drts; |
|
771 |
||
772 |
if (ti->tileh != 0) {
|
|
773 |
int f = GetRoadFoundation(ti->tileh, ti->map5 & 0xF); |
|
774 |
if (f) DrawFoundation(ti, f); |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
775 |
|
| 0 | 776 |
// default sloped sprites.. |
777 |
if (ti->tileh != 0) {
|
|
778 |
image = _road_sloped_sprites[ti->tileh - 1] + 0x53F; |
|
779 |
} else {
|
|
780 |
image = _road_tile_sprites_1[ti->map5 & 0xF]; |
|
781 |
} |
|
782 |
} else {
|
|
783 |
image = _road_tile_sprites_1[ti->map5 & 0xF]; |
|
784 |
} |
|
785 |
||
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
786 |
m2 = (_m[ti->tile].m4 & 0x70) >> 4; |
| 0 | 787 |
|
788 |
if (m2 == 0) image |= 0x3178000; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
789 |
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
790 |
if (_m[ti->tile].m4 & 0x80) {
|
| 0 | 791 |
image += 19; |
792 |
} else if (m2 > 1 && m2 != 6) {
|
|
793 |
image -= 19; /* pavement along the road? */ |
|
794 |
} |
|
795 |
||
796 |
DrawGroundSprite(image); |
|
797 |
||
798 |
if (!(_display_opt & DO_FULL_DETAIL) || _cur_dpi->zoom == 2) |
|
799 |
return; |
|
800 |
||
801 |
if (m2 >= 6) {
|
|
802 |
// roadwork |
|
803 |
DrawGroundSprite(0x586 + ((ti->map5&8)!=0 ? 0 : 1)); |
|
804 |
return; |
|
805 |
} |
|
806 |
||
| 1398 | 807 |
drts = _road_display_table[m2][ti->map5 & 0xF]; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
808 |
|
| 0 | 809 |
while ((image = drts->image) != 0) {
|
810 |
int x = ti->x | drts->subcoord_x; |
|
811 |
int y = ti->y | drts->subcoord_y; |
|
812 |
byte z = ti->z; |
|
813 |
if (ti->tileh != 0) z = GetSlopeZ(x, y); |
|
814 |
AddSortableSpriteToDraw(image, x, y, 2, 2, 0x10, z); |
|
815 |
drts++; |
|
816 |
} |
|
|
13
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
817 |
} else if ( (ti->map5 & 0xE0) == 0) { // railroad crossing
|
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
818 |
int f = GetRoadFoundation(ti->tileh, ti->map5 & 0xF); |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
819 |
if (f) DrawFoundation(ti, f); |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
820 |
|
| 0 | 821 |
image = 0x55B; |
822 |
||
823 |
if ( (ti->map5 & 8) != 0) |
|
824 |
image--; |
|
825 |
||
826 |
if ( (ti->map5 & 4) != 0) |
|
827 |
image += 2; |
|
828 |
||
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
829 |
if ( _m[ti->tile].m4 & 0x80) {
|
| 0 | 830 |
image += 8; |
831 |
} else {
|
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
832 |
m2 = (_m[ti->tile].m4 & 0x70) >> 4; |
| 0 | 833 |
if (m2 == 0) image |= 0x3178000; |
834 |
if (m2 > 1) image += 4; |
|
835 |
} |
|
836 |
||
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
837 |
DrawGroundSprite(image + (_m[ti->tile].m4 & 0xF) * 12); |
|
2008
c9d6585c96c8
(svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
hackykid
parents:
1986
diff
changeset
|
838 |
|
|
c9d6585c96c8
(svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
hackykid
parents:
1986
diff
changeset
|
839 |
if (_debug_pbs_level >= 1) {
|
|
c9d6585c96c8
(svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
hackykid
parents:
1986
diff
changeset
|
840 |
byte pbs = PBSTileReserved(ti->tile); |
|
c9d6585c96c8
(svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
hackykid
parents:
1986
diff
changeset
|
841 |
if (pbs & TRACK_BIT_DIAG1) DrawGroundSprite(0x3ED | PALETTE_CRASH); |
|
c9d6585c96c8
(svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
hackykid
parents:
1986
diff
changeset
|
842 |
if (pbs & TRACK_BIT_DIAG2) DrawGroundSprite(0x3EE | PALETTE_CRASH); |
|
c9d6585c96c8
(svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
hackykid
parents:
1986
diff
changeset
|
843 |
if (pbs & TRACK_BIT_UPPER) DrawGroundSprite(0x3EF | PALETTE_CRASH); |
|
c9d6585c96c8
(svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
hackykid
parents:
1986
diff
changeset
|
844 |
if (pbs & TRACK_BIT_LOWER) DrawGroundSprite(0x3F0 | PALETTE_CRASH); |
|
c9d6585c96c8
(svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
hackykid
parents:
1986
diff
changeset
|
845 |
if (pbs & TRACK_BIT_LEFT) DrawGroundSprite(0x3F2 | PALETTE_CRASH); |
|
c9d6585c96c8
(svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
hackykid
parents:
1986
diff
changeset
|
846 |
if (pbs & TRACK_BIT_RIGHT) DrawGroundSprite(0x3F1 | PALETTE_CRASH); |
|
c9d6585c96c8
(svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
hackykid
parents:
1986
diff
changeset
|
847 |
} |
|
c9d6585c96c8
(svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
hackykid
parents:
1986
diff
changeset
|
848 |
|
| 0 | 849 |
} else {
|
850 |
uint32 ormod; |
|
851 |
int player; |
|
852 |
const DrawRoadSeqStruct *drss; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
853 |
|
| 0 | 854 |
if (ti->tileh != 0) { DrawFoundation(ti, ti->tileh); }
|
855 |
||
856 |
ormod = 0x315; |
|
|
1901
fb05044cf5c3
(svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner
tron
parents:
1891
diff
changeset
|
857 |
player = GetTileOwner(ti->tile); |
| 0 | 858 |
if (player < MAX_PLAYERS) |
859 |
ormod = PLAYER_SPRITE_COLOR(player); |
|
860 |
||
| 1398 | 861 |
drss = _road_display_datas[ti->map5 & 0xF]; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
862 |
|
| 1398 | 863 |
DrawGroundSprite(drss++->image); |
| 0 | 864 |
|
| 1398 | 865 |
for (; drss->image != 0; drss++) {
|
866 |
uint32 image = drss->image; |
|
867 |
||
| 0 | 868 |
if (image & 0x8000) |
869 |
image |= ormod; |
|
|
497
2d6d31173813
(svn r787) Invert the sense of the DO_TRANS_BUILDINGS flag to be consistent with its own name and all other DO_* flags.
tron
parents:
473
diff
changeset
|
870 |
if (_display_opt & DO_TRANS_BUILDINGS) // show transparent depots |
|
204
1646d7049950
(svn r205) -Fix: [1026271] Vehicle depots not transparent with transparent buildings.
darkvater
parents:
201
diff
changeset
|
871 |
image = (image & 0x3FFF) | 0x3224000; |
| 0 | 872 |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
873 |
AddSortableSpriteToDraw(image, ti->x | drss->subcoord_x, |
| 0 | 874 |
ti->y | drss->subcoord_y, drss->width, drss->height, 0x14, ti->z); |
875 |
} |
|
876 |
} |
|
877 |
} |
|
878 |
||
879 |
void DrawRoadDepotSprite(int x, int y, int image) |
|
880 |
{
|
|
881 |
uint32 ormod; |
|
882 |
const DrawRoadSeqStruct *dtss; |
|
883 |
||
884 |
ormod = PLAYER_SPRITE_COLOR(_local_player); |
|
885 |
||
| 1398 | 886 |
dtss = _road_display_datas[image]; |
| 0 | 887 |
|
888 |
x+=33; |
|
889 |
y+=17; |
|
890 |
||
| 1398 | 891 |
DrawSprite(dtss++->image, x, y); |
| 0 | 892 |
|
| 1398 | 893 |
for(; dtss->image != 0; dtss++) {
|
| 0 | 894 |
Point pt = RemapCoords(dtss->subcoord_x, dtss->subcoord_y, 0); |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
895 |
|
| 0 | 896 |
image = dtss->image; |
897 |
if (image & 0x8000) |
|
898 |
image |= ormod; |
|
899 |
||
900 |
DrawSprite(image, x + pt.x, y + pt.y); |
|
901 |
} |
|
902 |
} |
|
903 |
||
| 410 | 904 |
static uint GetSlopeZ_Road(TileInfo *ti) |
| 0 | 905 |
{
|
906 |
uint z = ti->z; |
|
907 |
int th = ti->tileh; |
|
908 |
||
909 |
// check if it's a foundation |
|
910 |
if (ti->tileh != 0) {
|
|
|
13
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
911 |
if ((ti->map5 & 0xE0) == 0) { /* road or crossing */
|
| 0 | 912 |
uint f = GetRoadFoundation(ti->tileh, ti->map5 & 0x3F); |
913 |
if (f != 0) {
|
|
914 |
if (f < 15) {
|
|
915 |
// leveled foundation |
|
916 |
return z + 8; |
|
917 |
} |
|
918 |
// inclined foundation |
|
919 |
th = _inclined_tileh[f - 15]; |
|
920 |
} |
|
921 |
} else if ((ti->map5 & 0xF0) == 0x20) {
|
|
922 |
// depot |
|
923 |
return z + 8; |
|
924 |
} |
|
925 |
return GetPartialZ(ti->x&0xF, ti->y&0xF, th) + z; |
|
926 |
} |
|
| 39 | 927 |
return z; // normal Z if no slope |
928 |
} |
|
929 |
||
| 1095 | 930 |
static uint GetSlopeTileh_Road(TileInfo *ti) |
| 39 | 931 |
{
|
932 |
// check if it's a foundation |
|
933 |
if (ti->tileh != 0) {
|
|
934 |
if ((ti->map5 & 0xE0) == 0) { /* road or crossing */
|
|
935 |
uint f = GetRoadFoundation(ti->tileh, ti->map5 & 0x3F); |
|
936 |
if (f != 0) {
|
|
937 |
if (f < 15) {
|
|
938 |
// leveled foundation |
|
939 |
return 0; |
|
940 |
} |
|
941 |
// inclined foundation |
|
942 |
return _inclined_tileh[f - 15]; |
|
943 |
} |
|
944 |
} else if ((ti->map5 & 0xF0) == 0x20) {
|
|
945 |
// depot |
|
946 |
return 0; |
|
947 |
} |
|
948 |
} |
|
949 |
return ti->tileh; |
|
| 0 | 950 |
} |
951 |
||
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
952 |
static void GetAcceptedCargo_Road(TileIndex tile, AcceptedCargo ac) |
| 0 | 953 |
{
|
954 |
/* not used */ |
|
955 |
} |
|
956 |
||
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
957 |
static void AnimateTile_Road(TileIndex tile) |
| 0 | 958 |
{
|
|
1927
4126e0e3e884
(svn r2433) - CodeChange: unmagicify all road/train crossings with IsLevelCrossing() function (peter1138)
Darkvater
parents:
1902
diff
changeset
|
959 |
if (IsLevelCrossing(tile)) {
|
| 0 | 960 |
MarkTileDirtyByTile(tile); |
961 |
} |
|
962 |
} |
|
963 |
||
964 |
static const byte _town_road_types[5][2] = {
|
|
965 |
{1,1},
|
|
966 |
{2,2},
|
|
967 |
{2,2},
|
|
968 |
{5,5},
|
|
969 |
{3,2},
|
|
970 |
}; |
|
971 |
||
972 |
static const byte _town_road_types_2[5][2] = {
|
|
973 |
{1,1},
|
|
974 |
{2,2},
|
|
975 |
{3,2},
|
|
976 |
{3,2},
|
|
977 |
{3,2},
|
|
978 |
}; |
|
979 |
||
980 |
||
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
981 |
static void TileLoop_Road(TileIndex tile) |
| 0 | 982 |
{
|
983 |
Town *t; |
|
984 |
int grp; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
985 |
|
| 0 | 986 |
if (_opt.landscape == LT_HILLY) {
|
987 |
// Fix snow style if the road is above the snowline |
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
988 |
if ((_m[tile].m4 & 0x80) != ((GetTileZ(tile) > _opt.snow_line) ? 0x80 : 0x00)) {
|
|
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
989 |
_m[tile].m4 ^= 0x80; |
| 0 | 990 |
MarkTileDirtyByTile(tile); |
991 |
} |
|
992 |
} else if (_opt.landscape == LT_DESERT) {
|
|
993 |
// Fix desert style |
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
994 |
if (GetMapExtraBits(tile) == 1 && !(_m[tile].m4 & 0x80)) {
|
|
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
995 |
_m[tile].m4 |= 0x80; |
| 0 | 996 |
MarkTileDirtyByTile(tile); |
997 |
} |
|
998 |
} |
|
999 |
||
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1000 |
if (_m[tile].m5 & 0xE0) |
| 0 | 1001 |
return; |
1002 |
||
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1003 |
if (((_m[tile].m4 & 0x70) >> 4) < 6) {
|
|
1281
1573d0e4e7a1
(svn r1785) -Fix: space-correctness in road_cmd.c, and one wrong line from last
truelight
parents:
1280
diff
changeset
|
1004 |
t = ClosestTownFromTile(tile, (uint)-1); |
|
1280
b6925875de49
(svn r1784) -Fix: removed ClosestTownFromTile where possible, or replaced it
truelight
parents:
1264
diff
changeset
|
1005 |
|
| 0 | 1006 |
grp = 0; |
1007 |
if (t != NULL) {
|
|
1008 |
grp = GetTownRadiusGroup(t, tile); |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1009 |
|
| 0 | 1010 |
// Show an animation to indicate road work |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1011 |
if (t->road_build_months != 0 && |
|
1245
768d9bc95aaa
(svn r1749) Move the functions which calculate distances to map.[ch] and give the more meaningful names
tron
parents:
1214
diff
changeset
|
1012 |
!(DistanceManhattan(t->xy, tile) >= 8 && grp == 0) && |
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1013 |
(_m[tile].m5==5 || _m[tile].m5==10)) {
|
| 0 | 1014 |
if (GetTileSlope(tile, NULL) == 0 && EnsureNoVehicle(tile) && CHANCE16(1,20)) {
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1015 |
_m[tile].m4 |= ((((_m[tile].m4 & 0x70) >> 4 ) <= 2) ? 7 : 6) << 4; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1016 |
|
| 541 | 1017 |
SndPlayTileFx(SND_21_JACKHAMMER, tile); |
| 0 | 1018 |
CreateEffectVehicleAbove( |
|
926
bd4312619522
(svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY]
tron
parents:
889
diff
changeset
|
1019 |
TileX(tile) * 16 + 7, |
|
bd4312619522
(svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY]
tron
parents:
889
diff
changeset
|
1020 |
TileY(tile) * 16 + 7, |
| 0 | 1021 |
0, |
|
1359
8ba976aed634
(svn r1863) Give the effect vehicle type enums more descriptive names and use the enum as parameter type for CreateEffectVehicle*()
tron
parents:
1327
diff
changeset
|
1022 |
EV_BULLDOZER); |
| 0 | 1023 |
MarkTileDirtyByTile(tile); |
1024 |
return; |
|
1025 |
} |
|
1026 |
} |
|
1027 |
} |
|
1028 |
||
1029 |
{
|
|
1030 |
const byte *p = (_opt.landscape == LT_CANDY) ? _town_road_types_2[grp] : _town_road_types[grp]; |
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1031 |
byte b = (_m[tile].m4 & 0x70) >> 4; |
| 0 | 1032 |
|
1033 |
if (b == p[0]) |
|
1034 |
return; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1035 |
|
| 0 | 1036 |
if (b == p[1]) {
|
1037 |
b = p[0]; |
|
1038 |
} else if (b == 0) {
|
|
1039 |
b = p[1]; |
|
1040 |
} else {
|
|
1041 |
b = 0; |
|
1042 |
} |
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1043 |
_m[tile].m4 = (_m[tile].m4 & ~0x70) | (b << 4); |
| 0 | 1044 |
MarkTileDirtyByTile(tile); |
1045 |
} |
|
1046 |
} else {
|
|
1047 |
// Handle road work |
|
|
1264
280792016b02
(svn r1768) -Codechange: Store town index in _map2 of town tiles
celestar
parents:
1247
diff
changeset
|
1048 |
//XXX undocumented |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1049 |
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1050 |
byte b = _m[tile].m4; |
|
1264
280792016b02
(svn r1768) -Codechange: Store town index in _map2 of town tiles
celestar
parents:
1247
diff
changeset
|
1051 |
//roadworks take place only |
|
280792016b02
(svn r1768) -Codechange: Store town index in _map2 of town tiles
celestar
parents:
1247
diff
changeset
|
1052 |
//keep roadworks running for 16 loops |
|
280792016b02
(svn r1768) -Codechange: Store town index in _map2 of town tiles
celestar
parents:
1247
diff
changeset
|
1053 |
//lower 4 bits of map3_hi store the counter now |
|
280792016b02
(svn r1768) -Codechange: Store town index in _map2 of town tiles
celestar
parents:
1247
diff
changeset
|
1054 |
if ((b & 0xF) != 0xF) {
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1055 |
_m[tile].m4 = b + 1; |
| 0 | 1056 |
return; |
1057 |
} |
|
|
1264
280792016b02
(svn r1768) -Codechange: Store town index in _map2 of town tiles
celestar
parents:
1247
diff
changeset
|
1058 |
//roadworks finished |
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1059 |
_m[tile].m4 = ((((b& 0x70) >> 4)== 6) ? 1 : 2) << 4; |
| 0 | 1060 |
MarkTileDirtyByTile(tile); |
1061 |
} |
|
1062 |
} |
|
1063 |
||
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
1064 |
void ShowRoadDepotWindow(TileIndex tile); |
| 0 | 1065 |
|
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
1066 |
static void ClickTile_Road(TileIndex tile) |
| 0 | 1067 |
{
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1068 |
if ((_m[tile].m5 & 0xF0) == 0x20) {
|
| 0 | 1069 |
ShowRoadDepotWindow(tile); |
1070 |
} |
|
1071 |
} |
|
1072 |
||
1073 |
static const byte _road_trackbits[16] = {
|
|
1074 |
0x0, 0x0, 0x0, 0x10, 0x0, 0x2, 0x8, 0x1A, 0x0, 0x4, 0x1, 0x15, 0x20, 0x26, 0x29, 0x3F, |
|
1075 |
}; |
|
1076 |
||
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
1077 |
static uint32 GetTileTrackStatus_Road(TileIndex tile, TransportType mode) |
|
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
1078 |
{
|
|
159
139cf78bfb28
(svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs)
truelight
parents:
149
diff
changeset
|
1079 |
if (mode == TRANSPORT_RAIL) {
|
|
1927
4126e0e3e884
(svn r2433) - CodeChange: unmagicify all road/train crossings with IsLevelCrossing() function (peter1138)
Darkvater
parents:
1902
diff
changeset
|
1080 |
if (!IsLevelCrossing(tile)) |
| 0 | 1081 |
return 0; |
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1082 |
return _m[tile].m5 & 8 ? 0x101 : 0x202; |
|
159
139cf78bfb28
(svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs)
truelight
parents:
149
diff
changeset
|
1083 |
} else if (mode == TRANSPORT_ROAD) {
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1084 |
byte b = _m[tile].m5; |
| 0 | 1085 |
if ((b & 0xF0) == 0) {
|
|
159
139cf78bfb28
(svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs)
truelight
parents:
149
diff
changeset
|
1086 |
/* Ordinary road */ |
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1087 |
if (!_road_special_gettrackstatus && ((_m[tile].m4&0x70) >> 4) >= 6) |
| 0 | 1088 |
return 0; |
1089 |
return _road_trackbits[b&0xF] * 0x101; |
|
|
1927
4126e0e3e884
(svn r2433) - CodeChange: unmagicify all road/train crossings with IsLevelCrossing() function (peter1138)
Darkvater
parents:
1902
diff
changeset
|
1090 |
} else if (IsLevelCrossing(tile)) {
|
|
159
139cf78bfb28
(svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs)
truelight
parents:
149
diff
changeset
|
1091 |
/* Crossing */ |
| 0 | 1092 |
uint32 r = 0x101; |
1093 |
if (b&8) r <<= 1; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1094 |
|
| 0 | 1095 |
if (b&4) {
|
1096 |
r *= 0x10001; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1097 |
} |
| 0 | 1098 |
return r; |
1099 |
} |
|
1100 |
} |
|
1101 |
return 0; |
|
1102 |
} |
|
1103 |
||
1104 |
static const StringID _road_tile_strings[] = {
|
|
1105 |
STR_1818_ROAD_RAIL_LEVEL_CROSSING, |
|
1106 |
STR_1817_ROAD_VEHICLE_DEPOT, |
|
1107 |
||
1108 |
STR_1814_ROAD, |
|
1109 |
STR_1814_ROAD, |
|
1110 |
STR_1814_ROAD, |
|
1111 |
STR_1815_ROAD_WITH_STREETLIGHTS, |
|
1112 |
STR_1814_ROAD, |
|
1113 |
STR_1816_TREE_LINED_ROAD, |
|
1114 |
STR_1814_ROAD, |
|
1115 |
STR_1814_ROAD, |
|
1116 |
}; |
|
1117 |
||
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
1118 |
static void GetTileDesc_Road(TileIndex tile, TileDesc *td) |
| 0 | 1119 |
{
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1120 |
int i = (_m[tile].m5 >> 4); |
| 0 | 1121 |
if (i == 0) |
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1122 |
i = ((_m[tile].m4 & 0x70) >> 4) + 3; |
| 0 | 1123 |
td->str = _road_tile_strings[i - 1]; |
|
1901
fb05044cf5c3
(svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner
tron
parents:
1891
diff
changeset
|
1124 |
td->owner = GetTileOwner(tile); |
| 0 | 1125 |
} |
1126 |
||
1127 |
static const byte _roadveh_enter_depot_unk0[4] = {
|
|
1128 |
8, 9, 0, 1 |
|
1129 |
}; |
|
1130 |
||
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
1131 |
static uint32 VehicleEnter_Road(Vehicle *v, TileIndex tile, int x, int y) |
| 0 | 1132 |
{
|
|
1927
4126e0e3e884
(svn r2433) - CodeChange: unmagicify all road/train crossings with IsLevelCrossing() function (peter1138)
Darkvater
parents:
1902
diff
changeset
|
1133 |
if (IsLevelCrossing(tile)) {
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1134 |
if (v->type == VEH_Train && (_m[tile].m5 & 4) == 0) {
|
| 0 | 1135 |
/* train crossing a road */ |
| 541 | 1136 |
SndPlayVehicleFx(SND_0E_LEVEL_CROSSING, v); |
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1137 |
_m[tile].m5 |= 4; |
| 0 | 1138 |
MarkTileDirtyByTile(tile); |
1139 |
} |
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1140 |
} else if ((_m[tile].m5&0xF0) == 0x20){
|
| 0 | 1141 |
if (v->type == VEH_Road && v->u.road.frame == 11) {
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1142 |
if (_roadveh_enter_depot_unk0[_m[tile].m5&3] == v->u.road.state) {
|
| 0 | 1143 |
RoadVehEnterDepot(v); |
1144 |
return 4; |
|
1145 |
} |
|
1146 |
} |
|
1147 |
} |
|
1148 |
return 0; |
|
1149 |
} |
|
1150 |
||
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
1151 |
static void VehicleLeave_Road(Vehicle *v, TileIndex tile, int x, int y) |
| 0 | 1152 |
{
|
|
1927
4126e0e3e884
(svn r2433) - CodeChange: unmagicify all road/train crossings with IsLevelCrossing() function (peter1138)
Darkvater
parents:
1902
diff
changeset
|
1153 |
if (IsLevelCrossing(tile) && v->type == VEH_Train && v->next == NULL) {
|
|
4126e0e3e884
(svn r2433) - CodeChange: unmagicify all road/train crossings with IsLevelCrossing() function (peter1138)
Darkvater
parents:
1902
diff
changeset
|
1154 |
// Turn off level crossing lights |
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1155 |
_m[tile].m5 &= ~4; |
| 0 | 1156 |
MarkTileDirtyByTile(tile); |
1157 |
} |
|
1158 |
} |
|
1159 |
||
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
1160 |
static void ChangeTileOwner_Road(TileIndex tile, byte old_player, byte new_player) |
| 0 | 1161 |
{
|
1162 |
byte b; |
|
1163 |
||
1164 |
// road/rail crossing where the road is owned by the current player? |
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1165 |
if (old_player == _m[tile].m3 && IsLevelCrossing(tile)) {
|
|
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1166 |
_m[tile].m3 = (new_player == 0xFF) ? OWNER_NONE : new_player; |
| 0 | 1167 |
} |
1168 |
||
|
1901
fb05044cf5c3
(svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner
tron
parents:
1891
diff
changeset
|
1169 |
if (!IsTileOwner(tile, old_player)) return; |
| 0 | 1170 |
|
1171 |
if (new_player != 255) {
|
|
| 1902 | 1172 |
SetTileOwner(tile, new_player); |
| 0 | 1173 |
} else {
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1174 |
b = _m[tile].m5&0xF0; |
| 0 | 1175 |
if (b == 0) {
|
| 1902 | 1176 |
SetTileOwner(tile, OWNER_NONE); |
|
1927
4126e0e3e884
(svn r2433) - CodeChange: unmagicify all road/train crossings with IsLevelCrossing() function (peter1138)
Darkvater
parents:
1902
diff
changeset
|
1177 |
} else if (IsLevelCrossing(tile)) {
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1178 |
_m[tile].m5 = (_m[tile].m5&8) ? 0x5 : 0xA; |
|
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1179 |
SetTileOwner(tile, _m[tile].m3); |
|
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1180 |
_m[tile].m3 = 0; |
|
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
1181 |
_m[tile].m4 &= 0x80; |
| 0 | 1182 |
} else {
|
1183 |
DoCommandByTile(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR); |
|
1184 |
} |
|
1185 |
} |
|
1186 |
} |
|
1187 |
||
|
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1059
diff
changeset
|
1188 |
void InitializeRoad(void) |
| 0 | 1189 |
{
|
1190 |
_last_built_road_depot_tile = 0; |
|
1191 |
} |
|
1192 |
||
1193 |
const TileTypeProcs _tile_type_road_procs = {
|
|
1194 |
DrawTile_Road, /* draw_tile_proc */ |
|
1195 |
GetSlopeZ_Road, /* get_slope_z_proc */ |
|
1196 |
ClearTile_Road, /* clear_tile_proc */ |
|
1197 |
GetAcceptedCargo_Road, /* get_accepted_cargo_proc */ |
|
1198 |
GetTileDesc_Road, /* get_tile_desc_proc */ |
|
1199 |
GetTileTrackStatus_Road, /* get_tile_track_status_proc */ |
|
1200 |
ClickTile_Road, /* click_tile_proc */ |
|
1201 |
AnimateTile_Road, /* animate_tile_proc */ |
|
1202 |
TileLoop_Road, /* tile_loop_clear */ |
|
1203 |
ChangeTileOwner_Road, /* change_tile_owner_clear */ |
|
1204 |
NULL, /* get_produced_cargo_proc */ |
|
1205 |
VehicleEnter_Road, /* vehicle_enter_tile_proc */ |
|
1206 |
VehicleLeave_Road, /* vehicle_leave_tile_proc */ |
|
| 39 | 1207 |
GetSlopeTileh_Road, /* get_slope_tileh_proc */ |
| 0 | 1208 |
}; |