| author | tron |
| Tue, 21 Feb 2006 06:43:53 +0000 | |
| changeset 3054 | 0cde017ea45d |
| parent 3017 | a75caf4efa2d |
| child 3055 | ed20cba49858 |
| permissions | -rw-r--r-- |
| 2186 | 1 |
/* $Id$ */ |
2 |
||
| 0 | 3 |
#include "stdafx.h" |
|
1891
862800791170
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1785
diff
changeset
|
4 |
#include "openttd.h" |
|
2008
cdb444f6d43c
(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
|
5 |
#include "table/sprites.h" |
|
507
04b5403aaf6b
(svn r815) Include strings.h only in the files which need it.
tron
parents:
497
diff
changeset
|
6 |
#include "table/strings.h" |
|
2163
b17b313113a0
(svn r2673) Include functions.h directly, not globally via openttd.h
tron
parents:
2148
diff
changeset
|
7 |
#include "functions.h" |
|
679
04ca2cd69420
(svn r1117) Move map arrays and some related macros into their own files map.c and map.h
tron
parents:
541
diff
changeset
|
8 |
#include "map.h" |
|
1209
2e00193652b2
(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
|
9 |
#include "tile.h" |
| 0 | 10 |
#include "vehicle.h" |
11 |
#include "viewport.h" |
|
12 |
#include "command.h" |
|
13 |
#include "player.h" |
|
14 |
#include "town.h" |
|
15 |
#include "gfx.h" |
|
|
337
cbe0c766c947
(svn r513) Merge revisions 402, 416, 417, 478, 479, 511, 512 from map to trunk
tron
parents:
241
diff
changeset
|
16 |
#include "sound.h" |
|
1313
f1013ec3d318
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1281
diff
changeset
|
17 |
#include "depot.h" |
| 0 | 18 |
|
| 22 | 19 |
/* When true, GetTrackStatus for roads will treat roads under reconstruction |
20 |
* as normal roads instead of impassable. This is used when detecting whether |
|
21 |
* a road can be removed. This is of course ugly, but I don't know a better |
|
22 |
* solution just like that... */ |
|
| 0 | 23 |
static bool _road_special_gettrackstatus; |
24 |
||
25 |
void RoadVehEnterDepot(Vehicle *v); |
|
26 |
||
27 |
||
|
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
28 |
static bool HasTileRoadAt(TileIndex tile, int i) |
| 0 | 29 |
{
|
30 |
int mask; |
|
31 |
byte b; |
|
32 |
||
|
1214
8262981ac274
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1209
diff
changeset
|
33 |
switch (GetTileType(tile)) {
|
| 0 | 34 |
case MP_STREET: |
|
2049
538e73c53f54
(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
|
35 |
b = _m[tile].m5; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
36 |
|
| 0 | 37 |
if ((b & 0xF0) == 0) {
|
|
1927
1181e7652e2f
(svn r2433) - CodeChange: unmagicify all road/train crossings with IsLevelCrossing() function (peter1138)
Darkvater
parents:
1902
diff
changeset
|
38 |
} else if (IsLevelCrossing(tile)) {
|
| 0 | 39 |
b = (b&8)?5:10; |
40 |
} else if ((b & 0xF0) == 0x20) {
|
|
41 |
return (~b & 3) == i; |
|
| 2951 | 42 |
} else {
|
| 0 | 43 |
return false; |
| 2951 | 44 |
} |
| 0 | 45 |
break; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
46 |
|
| 0 | 47 |
case MP_STATION: |
|
2049
538e73c53f54
(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
|
48 |
b = _m[tile].m5; |
| 2951 | 49 |
if (!IS_BYTE_INSIDE(b, 0x43, 0x43 + 8)) return false; |
| 0 | 50 |
return ((~(b - 0x43) & 3) == i); |
51 |
||
52 |
case MP_TUNNELBRIDGE: |
|
53 |
mask = GetRoadBitsByTile(tile); |
|
54 |
b = 10; if (mask & 1) break; |
|
55 |
b = 5; if (mask & 2) break; |
|
56 |
return false; |
|
57 |
||
58 |
default: |
|
59 |
return false; |
|
60 |
} |
|
61 |
||
62 |
return HASBIT(b, i); |
|
63 |
} |
|
64 |
||
|
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
65 |
static bool CheckAllowRemoveRoad(TileIndex tile, uint br, bool *edge_road) |
| 0 | 66 |
{
|
67 |
int blocks; |
|
68 |
byte owner; |
|
69 |
uint n; |
|
70 |
*edge_road = true; |
|
71 |
||
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
72 |
if (_game_mode == GM_EDITOR) return true; |
| 0 | 73 |
|
74 |
blocks = GetRoadBitsByTile(tile); |
|
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
75 |
if (blocks == 0) return true; |
| 0 | 76 |
|
77 |
// Only do the special processing for actual players. |
|
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
78 |
if (_current_player >= MAX_PLAYERS) return true; |
| 0 | 79 |
|
80 |
// A railway crossing has the road owner in the map3_lo byte. |
|
|
1927
1181e7652e2f
(svn r2433) - CodeChange: unmagicify all road/train crossings with IsLevelCrossing() function (peter1138)
Darkvater
parents:
1902
diff
changeset
|
81 |
if (IsTileType(tile, MP_STREET) && IsLevelCrossing(tile)) {
|
|
2049
538e73c53f54
(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
|
82 |
owner = _m[tile].m3; |
| 0 | 83 |
} else {
|
|
1901
03bf9bf99319
(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
|
84 |
owner = GetTileOwner(tile); |
| 0 | 85 |
} |
86 |
// Only do the special processing if the road is owned |
|
87 |
// by a town |
|
88 |
if (owner != OWNER_TOWN) {
|
|
89 |
return owner == OWNER_NONE || CheckOwnership(owner); |
|
90 |
} |
|
91 |
||
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
92 |
if (_cheats.magic_bulldozer.value) return true; |
| 0 | 93 |
|
94 |
// Get a bitmask of which neighbouring roads has a tile |
|
95 |
n = 0; |
|
96 |
if (blocks&0x25 && HasTileRoadAt(TILE_ADDXY(tile,-1, 0), 1)) n |= 8; |
|
97 |
if (blocks&0x2A && HasTileRoadAt(TILE_ADDXY(tile, 0, 1), 0)) n |= 4; |
|
98 |
if (blocks&0x19 && HasTileRoadAt(TILE_ADDXY(tile, 1, 0), 3)) n |= 2; |
|
99 |
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
|
100 |
|
| 0 | 101 |
// If 0 or 1 bits are set in n, or if no bits that match the bits to remove, |
102 |
// then allow it |
|
103 |
if ((n & (n-1)) != 0 && (n & br) != 0) {
|
|
104 |
Town *t; |
|
105 |
*edge_road = false; |
|
106 |
// you can remove all kind of roads with extra dynamite |
|
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
107 |
if (_patches.extra_dynamite) return true; |
| 0 | 108 |
|
|
1638
4779658c2d03
(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
|
109 |
t = ClosestTownFromTile(tile, _patches.dist_local_authority); |
|
4779658c2d03
(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
|
110 |
|
|
534
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
111 |
SetDParam(0, t->index); |
| 0 | 112 |
_error_message = STR_2009_LOCAL_AUTHORITY_REFUSES; |
113 |
return false; |
|
114 |
} |
|
115 |
||
116 |
return true; |
|
117 |
} |
|
118 |
||
119 |
uint GetRoadBitsByTile(TileIndex tile) |
|
120 |
{
|
|
|
159
139cf78bfb28
(svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs)
truelight
parents:
149
diff
changeset
|
121 |
uint32 r = GetTileTrackStatus(tile, TRANSPORT_ROAD); |
| 0 | 122 |
return (byte)(r | (r >> 8)); |
123 |
} |
|
124 |
||
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
125 |
/** Delete a piece of road. |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
126 |
* @param x,y tile coordinates for road construction |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
127 |
* @param p1 road piece flags |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
128 |
* @param p2 unused |
| 0 | 129 |
*/ |
130 |
int32 CmdRemoveRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
|
131 |
{
|
|
|
1638
4779658c2d03
(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
|
132 |
// cost for removing inner/edge -roads |
|
4779658c2d03
(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
|
133 |
static const uint16 road_remove_cost[2] = {50, 18};
|
|
4779658c2d03
(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
|
134 |
|
| 0 | 135 |
TileInfo ti; |
136 |
int32 cost; |
|
|
1638
4779658c2d03
(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 |
TileIndex tile; |
|
2074
089fab08189c
(svn r2584) - Fix: Game no longer asserts when you use the remove-road tool on a town building or industry.
Darkvater
parents:
2049
diff
changeset
|
138 |
PlayerID owner; |
| 0 | 139 |
Town *t; |
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
140 |
/* true if the roadpiece was always removeable, |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
141 |
* false if it was a center piece. Affects town ratings drop */ |
| 0 | 142 |
bool edge_road; |
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
143 |
byte pieces = (byte)p1; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
144 |
|
| 0 | 145 |
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); |
146 |
||
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
147 |
/* Road pieces are max 4 bitset values (NE, NW, SE, SW) */ |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
148 |
if (pieces >> 4) return CMD_ERROR; |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
149 |
|
| 0 | 150 |
FindLandscapeHeight(&ti, x, y); |
151 |
tile = ti.tile; |
|
|
1638
4779658c2d03
(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
|
152 |
|
|
2074
089fab08189c
(svn r2584) - Fix: Game no longer asserts when you use the remove-road tool on a town building or industry.
Darkvater
parents:
2049
diff
changeset
|
153 |
if (!IsTileType(tile, MP_STREET) && !IsTileType(tile, MP_TUNNELBRIDGE)) return CMD_ERROR; |
|
089fab08189c
(svn r2584) - Fix: Game no longer asserts when you use the remove-road tool on a town building or industry.
Darkvater
parents:
2049
diff
changeset
|
154 |
|
|
089fab08189c
(svn r2584) - Fix: Game no longer asserts when you use the remove-road tool on a town building or industry.
Darkvater
parents:
2049
diff
changeset
|
155 |
// owner for railroad crossing is stored somewhere else |
|
1638
4779658c2d03
(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 |
// XXX - Fix this so for a given tiletype the owner of the type is in the same variable |
|
2074
089fab08189c
(svn r2584) - Fix: Game no longer asserts when you use the remove-road tool on a town building or industry.
Darkvater
parents:
2049
diff
changeset
|
157 |
owner = IsLevelCrossing(tile) ? _m[tile].m3 : GetTileOwner(tile); |
|
1638
4779658c2d03
(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 |
|
|
4779658c2d03
(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
|
159 |
if (owner == OWNER_TOWN && _game_mode != GM_EDITOR) {
|
|
4779658c2d03
(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
|
160 |
if (IsTileType(tile, MP_TUNNELBRIDGE)) { // index of town is not saved for bridge (no space)
|
|
4779658c2d03
(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 |
t = ClosestTownFromTile(tile, _patches.dist_local_authority); |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
162 |
} else {
|
|
2049
538e73c53f54
(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
|
163 |
t = GetTown(_m[tile].m2); |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
164 |
} |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
165 |
} else {
|
|
1280
33a251c30758
(svn r1784) -Fix: removed ClosestTownFromTile where possible, or replaced it
truelight
parents:
1264
diff
changeset
|
166 |
t = NULL; |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
167 |
} |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
168 |
|
| 0 | 169 |
// allow deleting road under bridge |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
170 |
if (ti.type != MP_TUNNELBRIDGE && !EnsureNoVehicle(tile)) return CMD_ERROR; |
| 0 | 171 |
|
172 |
{
|
|
173 |
bool b; |
|
174 |
_road_special_gettrackstatus = true; |
|
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
175 |
b = CheckAllowRemoveRoad(tile, pieces, &edge_road); |
| 0 | 176 |
_road_special_gettrackstatus = false; |
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
177 |
if (!b) return CMD_ERROR; |
| 0 | 178 |
} |
179 |
||
180 |
if (ti.type == MP_TUNNELBRIDGE) {
|
|
|
1041
94db182c3614
(svn r1542) Rename TileHeight to TilePixelHeight, because this is what it actually returns
tron
parents:
1035
diff
changeset
|
181 |
if (!EnsureNoVehicleZ(tile, TilePixelHeight(tile))) |
| 0 | 182 |
return CMD_ERROR; |
183 |
||
184 |
if ((ti.map5 & 0xE9) == 0xE8) {
|
|
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
185 |
if (pieces & 10) goto return_error; |
| 0 | 186 |
} else if ((ti.map5 & 0xE9) == 0xE9) {
|
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
187 |
if (pieces & 5) goto return_error; |
| 0 | 188 |
} else |
189 |
goto return_error; |
|
190 |
||
191 |
cost = _price.remove_road * 2; |
|
192 |
||
193 |
if (flags & DC_EXEC) {
|
|
|
1638
4779658c2d03
(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
|
194 |
ChangeTownRating(t, -road_remove_cost[(byte)edge_road], RATING_ROAD_MINIMUM); |
|
2049
538e73c53f54
(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
|
195 |
_m[tile].m5 = ti.map5 & 0xC7; |
| 1902 | 196 |
SetTileOwner(tile, OWNER_NONE); |
| 0 | 197 |
MarkTileDirtyByTile(tile); |
198 |
} |
|
199 |
return cost; |
|
200 |
} else if (ti.type == MP_STREET) {
|
|
|
1638
4779658c2d03
(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
|
201 |
// check if you're allowed to remove the street owned by a town |
|
4779658c2d03
(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
|
202 |
// removal allowance depends on difficulty setting |
|
2958
ac0a9673b522
(svn r3520) Remove unused parameters from some functions
tron
parents:
2952
diff
changeset
|
203 |
if (!CheckforTownRating(flags, t, ROAD_REMOVE)) return CMD_ERROR; |
|
1638
4779658c2d03
(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
|
204 |
|
|
4779658c2d03
(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 |
// XXX - change cascading ifs to switch when doing rewrite |
|
4779658c2d03
(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 |
if ((ti.map5 & 0xF0) == 0) { // normal road
|
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
207 |
byte c = pieces, t2; |
| 0 | 208 |
|
209 |
if (ti.tileh != 0 && (ti.map5 == 5 || ti.map5 == 10)) {
|
|
210 |
c |= (c & 0xC) >> 2; |
|
211 |
c |= (c & 0x3) << 2; |
|
212 |
} |
|
213 |
||
214 |
// limit the bits to delete to the existing bits. |
|
215 |
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
|
216 |
|
| 0 | 217 |
// calculate the cost |
218 |
t2 = c; |
|
219 |
cost = 0; |
|
220 |
do {
|
|
| 2952 | 221 |
if (t2 & 1) cost += _price.remove_road; |
222 |
} while (t2 >>= 1); |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
223 |
|
| 0 | 224 |
if (flags & DC_EXEC) {
|
|
1638
4779658c2d03
(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
|
225 |
ChangeTownRating(t, -road_remove_cost[(byte)edge_road], RATING_ROAD_MINIMUM); |
| 0 | 226 |
|
|
2049
538e73c53f54
(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
|
227 |
_m[tile].m5 ^= c; |
|
2493
f6b4300cc2b0
(svn r3019) -Codechange: Replace explicit shifting/anding/oring with GB and SB
tron
parents:
2471
diff
changeset
|
228 |
if (GB(_m[tile].m5, 0, 4) == 0) {
|
| 0 | 229 |
DoClearSquare(tile); |
|
2493
f6b4300cc2b0
(svn r3019) -Codechange: Replace explicit shifting/anding/oring with GB and SB
tron
parents:
2471
diff
changeset
|
230 |
} else {
|
| 0 | 231 |
MarkTileDirtyByTile(tile); |
|
2493
f6b4300cc2b0
(svn r3019) -Codechange: Replace explicit shifting/anding/oring with GB and SB
tron
parents:
2471
diff
changeset
|
232 |
} |
| 0 | 233 |
} |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
234 |
return cost; |
|
1638
4779658c2d03
(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
|
235 |
} else if ((ti.map5 & 0xE0) == 0) { // railroad crossing
|
| 0 | 236 |
byte c; |
237 |
||
238 |
if (!(ti.map5 & 8)) {
|
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
239 |
c = 2; |
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
240 |
if (pieces & 5) goto return_error; |
| 0 | 241 |
} else {
|
242 |
c = 1; |
|
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
243 |
if (pieces & 10) goto return_error; |
| 0 | 244 |
} |
245 |
||
246 |
cost = _price.remove_road * 2; |
|
247 |
if (flags & DC_EXEC) {
|
|
|
1638
4779658c2d03
(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
|
248 |
ChangeTownRating(t, -road_remove_cost[(byte)edge_road], RATING_ROAD_MINIMUM); |
|
4779658c2d03
(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
|
249 |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
250 |
ModifyTile(tile, |
| 0 | 251 |
MP_SETTYPE(MP_RAILWAY) | |
252 |
MP_MAP2_CLEAR | MP_MAP3LO | MP_MAP3HI_CLEAR | MP_MAP5, |
|
|
2049
538e73c53f54
(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
|
253 |
_m[tile].m4 & 0xF, /* map3_lo */ |
| 0 | 254 |
c /* map5 */ |
255 |
); |
|
256 |
} |
|
257 |
return cost; |
|
258 |
} else |
|
259 |
goto return_error; |
|
260 |
||
261 |
} else {
|
|
262 |
return_error:; |
|
263 |
return_cmd_error(INVALID_STRING_ID); |
|
264 |
} |
|
265 |
} |
|
266 |
||
267 |
||
268 |
enum {
|
|
269 |
ROAD_NW = 1, // NW road track |
|
270 |
ROAD_SW = 2, // SW road track |
|
271 |
ROAD_SE = 4, // SE road track |
|
272 |
ROAD_NE = 8, // NE road track |
|
273 |
ROAD_ALL = (ROAD_NW | ROAD_SW | ROAD_SE | ROAD_NE) |
|
274 |
}; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
275 |
|
|
13
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
276 |
static const byte _valid_tileh_slopes_road[3][15] = {
|
| 0 | 277 |
// set of normal ones |
278 |
{
|
|
279 |
ROAD_ALL, 0, 0, |
|
280 |
ROAD_SW | ROAD_NE, 0, 0, // 3, 4, 5 |
|
281 |
ROAD_NW | ROAD_SE, 0, 0, |
|
282 |
ROAD_NW | ROAD_SE, 0, 0, // 9, 10, 11 |
|
283 |
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
|
284 |
}, |
| 0 | 285 |
// 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
|
286 |
{
|
| 0 | 287 |
0, |
288 |
ROAD_SW | ROAD_NW, |
|
289 |
ROAD_SW | ROAD_SE, |
|
290 |
ROAD_NW | ROAD_SE | ROAD_SW, |
|
291 |
||
292 |
ROAD_SE | ROAD_NE, // 4 |
|
293 |
ROAD_ALL, |
|
294 |
ROAD_SW | ROAD_NE | ROAD_SE, |
|
295 |
ROAD_ALL, |
|
296 |
||
297 |
ROAD_NW | ROAD_NE, // 8 |
|
298 |
ROAD_SW | ROAD_NE | ROAD_NW, |
|
299 |
ROAD_ALL, |
|
300 |
ROAD_ALL, |
|
301 |
||
302 |
ROAD_NW | ROAD_SE | ROAD_NE, // 12 |
|
303 |
ROAD_ALL, |
|
304 |
ROAD_ALL |
|
|
13
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
305 |
}, |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
306 |
// valid railway crossings on slopes |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
307 |
{
|
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
308 |
1, 0, 0, // 0, 1, 2 |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
309 |
0, 0, 1, // 3, 4, 5 |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
310 |
0, 1, 0, // 6, 7, 8 |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
311 |
0, 1, 1, // 9, 10, 11 |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
312 |
0, 1, 1, // 12, 13, 14 |
| 0 | 313 |
} |
314 |
}; |
|
315 |
||
316 |
||
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
317 |
static uint32 CheckRoadSlope(int tileh, byte *pieces, byte existing) |
| 0 | 318 |
{
|
|
2085
876f20a0e843
(svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep
celestar
parents:
2074
diff
changeset
|
319 |
if (!IsSteepTileh(tileh)) {
|
| 0 | 320 |
byte road_bits = *pieces | existing; |
321 |
||
322 |
// no special foundation |
|
323 |
if ((~_valid_tileh_slopes_road[0][tileh] & road_bits) == 0) {
|
|
324 |
// force that all bits are set when we have slopes |
|
325 |
if (tileh != 0) *pieces |= _valid_tileh_slopes_road[0][tileh]; |
|
326 |
return 0; // no extra cost |
|
327 |
} |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
328 |
|
| 0 | 329 |
// foundation is used. Whole tile is leveled up |
330 |
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
|
331 |
return existing ? 0 : _price.terraform; |
| 0 | 332 |
} |
333 |
||
334 |
// partly leveled up tile, only if there's no road on that tile |
|
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
335 |
if (!existing && (tileh == 1 || tileh == 2 || tileh == 4 || tileh == 8)) {
|
| 0 | 336 |
// force full pieces. |
337 |
*pieces |= (*pieces & 0xC) >> 2; |
|
338 |
*pieces |= (*pieces & 0x3) << 2; |
|
|
72
24bdf837198c
(svn r73) -Fix: Wrong building of road-slopes for a future AI/Town
darkvater
parents:
39
diff
changeset
|
339 |
return (*pieces == (ROAD_NE|ROAD_SW) || *pieces == (ROAD_SE|ROAD_NW)) ? _price.terraform : CMD_ERROR; |
| 0 | 340 |
} |
341 |
} |
|
342 |
return CMD_ERROR; |
|
343 |
} |
|
344 |
||
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
345 |
/** Build a piece of road. |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
346 |
* @param x,y tile coordinates for road construction |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
347 |
* @param p1 road piece flags |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
348 |
* @param p2 the town that is building the road (0 if not applicable) |
| 0 | 349 |
*/ |
350 |
int32 CmdBuildRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
|
351 |
{
|
|
352 |
TileInfo ti; |
|
353 |
int32 cost; |
|
354 |
byte pieces = (byte)p1, existing = 0; |
|
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
355 |
TileIndex tile; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
356 |
|
| 0 | 357 |
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); |
358 |
||
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
359 |
/* Road pieces are max 4 bitset values (NE, NW, SE, SW) and town can only be non-zero |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
360 |
* if a non-player is building the road */ |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
361 |
if ((pieces >> 4) || (_current_player < MAX_PLAYERS && p2 != 0) || !IsTownIndex(p2)) return CMD_ERROR; |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
362 |
|
| 0 | 363 |
FindLandscapeHeight(&ti, x, y); |
364 |
tile = ti.tile; |
|
365 |
||
366 |
// allow building road under bridge |
|
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
367 |
if (ti.type != MP_TUNNELBRIDGE && !EnsureNoVehicle(tile)) return CMD_ERROR; |
| 0 | 368 |
|
369 |
if (ti.type == MP_STREET) {
|
|
370 |
if (!(ti.map5 & 0xF0)) {
|
|
| 2639 | 371 |
if ((pieces & (byte)ti.map5) == pieces) |
| 0 | 372 |
return_cmd_error(STR_1007_ALREADY_BUILT); |
373 |
existing = ti.map5; |
|
374 |
} else {
|
|
375 |
if (!(ti.map5 & 0xE0) && pieces != ((ti.map5 & 8) ? 5 : 10)) |
|
376 |
return_cmd_error(STR_1007_ALREADY_BUILT); |
|
377 |
goto do_clear; |
|
378 |
} |
|
379 |
} else if (ti.type == MP_RAILWAY) {
|
|
380 |
byte m5; |
|
381 |
||
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
382 |
if (IsSteepTileh(ti.tileh)) { // very steep tile
|
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
383 |
return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION); |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
384 |
} |
|
13
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
385 |
|
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
386 |
if (!_valid_tileh_slopes_road[2][ti.tileh]) { // prevent certain slopes
|
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
387 |
return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION); |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
388 |
} |
|
13
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
389 |
|
| 0 | 390 |
if (ti.map5 == 2) {
|
391 |
if (pieces & 5) goto do_clear; |
|
392 |
m5 = 0x10; |
|
393 |
} else if (ti.map5 == 1) {
|
|
394 |
if (pieces & 10) goto do_clear; |
|
395 |
m5 = 0x18; |
|
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
396 |
} else {
|
| 0 | 397 |
goto do_clear; |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
398 |
} |
| 0 | 399 |
|
400 |
if (flags & DC_EXEC) {
|
|
401 |
ModifyTile(tile, |
|
402 |
MP_SETTYPE(MP_STREET) | |
|
|
1264
acebb2b01e32
(svn r1768) -Codechange: Store town index in _map2 of town tiles
celestar
parents:
1247
diff
changeset
|
403 |
MP_MAP2 | MP_MAP3LO | MP_MAP3HI | MP_MAP5, |
|
acebb2b01e32
(svn r1768) -Codechange: Store town index in _map2 of town tiles
celestar
parents:
1247
diff
changeset
|
404 |
p2, |
| 0 | 405 |
_current_player, /* map3_lo */ |
|
2049
538e73c53f54
(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
|
406 |
_m[tile].m3 & 0xF, /* map3_hi */ |
| 0 | 407 |
m5 /* map5 */ |
408 |
); |
|
409 |
} |
|
410 |
return _price.build_road * 2; |
|
411 |
} else if (ti.type == MP_TUNNELBRIDGE) {
|
|
412 |
/* check for flat land */ |
|
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
413 |
if (IsSteepTileh(ti.tileh)) { // very steep tile
|
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
414 |
return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION); |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
415 |
} |
| 0 | 416 |
|
417 |
/* is this middle part of a bridge? */ |
|
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
418 |
if ((ti.map5 & 0xC0) != 0xC0) goto do_clear; |
| 0 | 419 |
|
420 |
/* only allow roads pertendicular to bridge */ |
|
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
421 |
if (((pieces & 5U) != 0) == ((ti.map5 & 0x01U) != 0)) goto do_clear; |
| 0 | 422 |
|
423 |
/* check if clear land under bridge */ |
|
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
424 |
if ((ti.map5 & 0xF8) == 0xE8) { /* road under bridge */
|
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
425 |
return_cmd_error(STR_1007_ALREADY_BUILT); |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
426 |
} else if ((ti.map5 & 0xE0) == 0xE0) { /* other transport route under bridge */
|
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
427 |
return_cmd_error(STR_1008_MUST_REMOVE_RAILROAD_TRACK); |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
428 |
} else if ((ti.map5 & 0xF8) == 0xC8) { /* water under bridge */
|
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
429 |
return_cmd_error(STR_3807_CAN_T_BUILD_ON_WATER); |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
430 |
} |
| 0 | 431 |
|
432 |
/* all checked, can build road now! */ |
|
433 |
cost = _price.build_road * 2; |
|
434 |
if (flags & DC_EXEC) {
|
|
435 |
ModifyTile(tile, |
|
436 |
MP_MAPOWNER_CURRENT | MP_MAP5, |
|
437 |
(ti.map5 & 0xC7) | 0x28 // map5 |
|
438 |
); |
|
439 |
} |
|
440 |
return cost; |
|
441 |
} else {
|
|
442 |
do_clear:; |
|
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
443 |
if (CmdFailed(DoCommandByTile(tile, 0, 0, flags & ~DC_EXEC, CMD_LANDSCAPE_CLEAR))) |
| 0 | 444 |
return CMD_ERROR; |
445 |
} |
|
446 |
||
447 |
cost = CheckRoadSlope(ti.tileh, &pieces, existing); |
|
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
448 |
if (CmdFailed(cost)) return_cmd_error(STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION); |
| 0 | 449 |
|
|
2422
897a01f7c624
(svn r2948) -Fix: the old AI needs a special flag that triggers all kind of special
truelight
parents:
2187
diff
changeset
|
450 |
if (cost && (!_patches.build_on_slopes || _is_old_ai_player)) |
| 0 | 451 |
return CMD_ERROR; |
452 |
||
| 2549 | 453 |
if (ti.type != MP_STREET || (ti.map5 & 0xF0) != 0) {
|
| 0 | 454 |
cost += DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR); |
455 |
} else {
|
|
456 |
// Don't put the pieces that already exist |
|
457 |
pieces &= ~ti.map5; |
|
458 |
} |
|
459 |
||
460 |
{
|
|
461 |
byte t = pieces; |
|
462 |
while (t) {
|
|
463 |
if (t & 1) cost += _price.build_road; |
|
464 |
t >>= 1; |
|
465 |
} |
|
466 |
} |
|
467 |
||
468 |
if (flags & DC_EXEC) {
|
|
469 |
if (ti.type != MP_STREET) {
|
|
|
1059
fe97d81a1b4f
(svn r1560) Introduce SetTileType() and SetTileHeight()
tron
parents:
1041
diff
changeset
|
470 |
SetTileType(tile, MP_STREET); |
|
2049
538e73c53f54
(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
|
471 |
_m[tile].m5 = 0; |
|
538e73c53f54
(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
|
472 |
_m[tile].m2 = p2; |
| 1902 | 473 |
SetTileOwner(tile, _current_player); |
| 0 | 474 |
} |
475 |
||
| 2549 | 476 |
_m[tile].m5 |= pieces; |
| 0 | 477 |
|
478 |
MarkTileDirtyByTile(tile); |
|
479 |
} |
|
480 |
return cost; |
|
481 |
} |
|
482 |
||
|
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
483 |
int32 DoConvertStreetRail(TileIndex tile, uint totype, bool exec) |
| 0 | 484 |
{
|
485 |
// not a railroad crossing? |
|
|
1927
1181e7652e2f
(svn r2433) - CodeChange: unmagicify all road/train crossings with IsLevelCrossing() function (peter1138)
Darkvater
parents:
1902
diff
changeset
|
486 |
if (!IsLevelCrossing(tile)) return CMD_ERROR; |
| 0 | 487 |
|
488 |
// not owned by me? |
|
489 |
if (!CheckTileOwnership(tile) || !EnsureNoVehicle(tile)) return CMD_ERROR; |
|
490 |
||
491 |
// tile is already of requested type? |
|
|
2493
f6b4300cc2b0
(svn r3019) -Codechange: Replace explicit shifting/anding/oring with GB and SB
tron
parents:
2471
diff
changeset
|
492 |
if (GB(_m[tile].m4, 0, 4) == totype) return CMD_ERROR; |
| 0 | 493 |
|
494 |
if (exec) {
|
|
495 |
// change type. |
|
|
2493
f6b4300cc2b0
(svn r3019) -Codechange: Replace explicit shifting/anding/oring with GB and SB
tron
parents:
2471
diff
changeset
|
496 |
SB(_m[tile].m4, 0, 4, totype); |
| 0 | 497 |
MarkTileDirtyByTile(tile); |
498 |
} |
|
499 |
||
500 |
return _price.build_rail >> 1; |
|
501 |
} |
|
502 |
||
503 |
||
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
504 |
/** Build a long piece of road. |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
505 |
* @param x,y end tile of drag |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
506 |
* @param p1 start tile of drag |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
507 |
* @param p2 various bitstuffed elements |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
508 |
* - p2 = (bit 0) - start tile starts in the 2nd half of tile (p2 & 1) |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
509 |
* - p2 = (bit 1) - end tile starts in the 2nd half of tile (p2 & 2) |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
510 |
* - p2 = (bit 2) - direction: 0 = along x-axis, 1 = along y-axis (p2 & 4) |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
511 |
*/ |
| 0 | 512 |
int32 CmdBuildLongRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
513 |
{
|
|
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
514 |
TileIndex start_tile, end_tile, tile; |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
515 |
int32 cost, ret; |
| 0 | 516 |
|
|
889
64d2f7d5f02b
(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
|
517 |
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); |
|
64d2f7d5f02b
(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
|
518 |
|
|
2934
3f29a7212713
(svn r3490) -Fix: A bunch (10) of off-by-one errors when checking if a TileIndex points to a tile on the map
tron
parents:
2916
diff
changeset
|
519 |
if (p1 >= MapSize()) return CMD_ERROR; |
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
520 |
|
| 0 | 521 |
start_tile = p1; |
|
1980
6c5917cfcb78
(svn r2486) Turn TILE_FROM_XY into an inline function and rename it to TileVirtXY
tron
parents:
1979
diff
changeset
|
522 |
end_tile = TileVirtXY(x, y); |
| 0 | 523 |
|
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
524 |
/* Only drag in X or Y direction dictated by the direction variable */ |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
525 |
if (!HASBIT(p2, 2) && TileY(start_tile) != TileY(end_tile)) return CMD_ERROR; // x-axis |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
526 |
if (HASBIT(p2, 2) && TileX(start_tile) != TileX(end_tile)) return CMD_ERROR; // y-axis |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
527 |
|
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
528 |
/* Swap start and ending tile, also the half-tile drag var (bit 0 and 1) */ |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
529 |
if (start_tile > end_tile || (start_tile == end_tile && HASBIT(p2, 0))) {
|
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
530 |
TileIndex t = start_tile; |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
531 |
start_tile = end_tile; |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
532 |
end_tile = t; |
| 0 | 533 |
p2 ^= IS_INT_INSIDE(p2&3, 1, 3) ? 3 : 0; |
534 |
} |
|
535 |
||
536 |
cost = 0; |
|
537 |
tile = start_tile; |
|
538 |
// Start tile is the small number. |
|
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
539 |
for (;;) {
|
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
540 |
uint bits = HASBIT(p2, 2) ? ROAD_SE | ROAD_NW : ROAD_SW | ROAD_NE; |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
541 |
if (tile == end_tile && !HASBIT(p2, 1)) bits &= ROAD_NW | ROAD_NE; |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
542 |
if (tile == start_tile && HASBIT(p2, 0)) bits &= ROAD_SE | ROAD_SW; |
| 0 | 543 |
|
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
544 |
ret = DoCommandByTile(tile, bits, 0, flags, CMD_BUILD_ROAD); |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
545 |
if (CmdFailed(ret)) {
|
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
546 |
if (_error_message != STR_1007_ALREADY_BUILT) return CMD_ERROR; |
| 2549 | 547 |
} else {
|
| 0 | 548 |
cost += ret; |
| 2549 | 549 |
} |
| 0 | 550 |
|
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
551 |
if (tile == end_tile) break; |
| 0 | 552 |
|
| 1981 | 553 |
tile += HASBIT(p2, 2) ? TileDiffXY(0, 1) : TileDiffXY(1, 0); |
| 0 | 554 |
} |
555 |
||
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
556 |
return (cost == 0) ? CMD_ERROR : cost; |
| 0 | 557 |
} |
558 |
||
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
559 |
/** Remove a long piece of road. |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
560 |
* @param x,y end tile of drag |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
561 |
* @param p1 start tile of drag |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
562 |
* @param p2 various bitstuffed elements |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
563 |
* - p2 = (bit 0) - start tile starts in the 2nd half of tile (p2 & 1) |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
564 |
* - p2 = (bit 1) - end tile starts in the 2nd half of tile (p2 & 2) |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
565 |
* - p2 = (bit 2) - direction: 0 = along x-axis, 1 = along y-axis (p2 & 4) |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
566 |
*/ |
| 0 | 567 |
int32 CmdRemoveLongRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
568 |
{
|
|
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
569 |
TileIndex start_tile, end_tile, tile; |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
570 |
int32 cost, ret; |
| 0 | 571 |
|
|
889
64d2f7d5f02b
(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
|
572 |
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); |
|
64d2f7d5f02b
(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
|
573 |
|
|
2934
3f29a7212713
(svn r3490) -Fix: A bunch (10) of off-by-one errors when checking if a TileIndex points to a tile on the map
tron
parents:
2916
diff
changeset
|
574 |
if (p1 >= MapSize()) return CMD_ERROR; |
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
575 |
|
| 0 | 576 |
start_tile = p1; |
|
1980
6c5917cfcb78
(svn r2486) Turn TILE_FROM_XY into an inline function and rename it to TileVirtXY
tron
parents:
1979
diff
changeset
|
577 |
end_tile = TileVirtXY(x, y); |
| 0 | 578 |
|
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
579 |
/* Only drag in X or Y direction dictated by the direction variable */ |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
580 |
if (!HASBIT(p2, 2) && TileY(start_tile) != TileY(end_tile)) return CMD_ERROR; // x-axis |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
581 |
if (HASBIT(p2, 2) && TileX(start_tile) != TileX(end_tile)) return CMD_ERROR; // y-axis |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
582 |
|
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
583 |
/* Swap start and ending tile, also the half-tile drag var (bit 0 and 1) */ |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
584 |
if (start_tile > end_tile || (start_tile == end_tile && HASBIT(p2, 0))) {
|
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
585 |
TileIndex t = start_tile; |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
586 |
start_tile = end_tile; |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
587 |
end_tile = t; |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
588 |
p2 ^= IS_INT_INSIDE(p2 & 3, 1, 3) ? 3 : 0; |
| 0 | 589 |
} |
590 |
||
591 |
cost = 0; |
|
592 |
tile = start_tile; |
|
593 |
// Start tile is the small number. |
|
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
594 |
for (;;) {
|
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
595 |
uint bits = HASBIT(p2, 2) ? ROAD_SE | ROAD_NW : ROAD_SW | ROAD_NE; |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
596 |
if (tile == end_tile && !HASBIT(p2, 1)) bits &= ROAD_NW | ROAD_NE; |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
597 |
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
|
598 |
|
| 0 | 599 |
// try to remove the halves. |
600 |
if (bits) {
|
|
601 |
ret = DoCommandByTile(tile, bits, 0, flags, CMD_REMOVE_ROAD); |
|
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
602 |
if (!CmdFailed(ret)) cost += ret; |
| 0 | 603 |
} |
604 |
||
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
605 |
if (tile == end_tile) break; |
| 0 | 606 |
|
| 1981 | 607 |
tile += HASBIT(p2, 2) ? TileDiffXY(0, 1) : TileDiffXY(1, 0); |
| 0 | 608 |
} |
609 |
||
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
610 |
return (cost == 0) ? CMD_ERROR : cost; |
| 0 | 611 |
} |
612 |
||
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
613 |
/** Build a road depot. |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
614 |
* @param x,y tile coordinates where the depot will be built |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
615 |
* @param p1 depot direction (0 through 3), where 0 is NW, 1 is NE, etc. |
|
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
616 |
* @param p2 unused |
|
2085
876f20a0e843
(svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep
celestar
parents:
2074
diff
changeset
|
617 |
* |
|
876f20a0e843
(svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep
celestar
parents:
2074
diff
changeset
|
618 |
* @todo When checking for the tile slope, |
|
876f20a0e843
(svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep
celestar
parents:
2074
diff
changeset
|
619 |
* distingush between "Flat land required" and "land sloped in wrong direction" |
| 0 | 620 |
*/ |
621 |
int32 CmdBuildRoadDepot(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
|
622 |
{
|
|
623 |
TileInfo ti; |
|
624 |
int32 cost; |
|
625 |
Depot *dep; |
|
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
626 |
TileIndex tile; |
| 0 | 627 |
|
628 |
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); |
|
629 |
||
|
1785
d3f3496b5943
(svn r2289) - Fix (regression): check p1 param of road-depot building instead of unused p2 (typo). Thanks peter1138.
Darkvater
parents:
1784
diff
changeset
|
630 |
if (p1 > 3) return CMD_ERROR; // check direction |
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
631 |
|
| 0 | 632 |
FindLandscapeHeight(&ti, x, y); |
633 |
||
634 |
tile = ti.tile; |
|
635 |
||
| 2549 | 636 |
if (!EnsureNoVehicle(tile)) return CMD_ERROR; |
| 0 | 637 |
|
| 2549 | 638 |
if (ti.tileh != 0 && ( |
639 |
!_patches.build_on_slopes || |
|
640 |
IsSteepTileh(ti.tileh) || |
|
641 |
!CanBuildDepotByTileh(p1, ti.tileh) |
|
642 |
)) {
|
|
643 |
return_cmd_error(STR_0007_FLAT_LAND_REQUIRED); |
|
| 0 | 644 |
} |
645 |
||
646 |
cost = DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR); |
|
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1638
diff
changeset
|
647 |
if (CmdFailed(cost)) return CMD_ERROR; |
| 0 | 648 |
|
649 |
dep = AllocateDepot(); |
|
| 2549 | 650 |
if (dep == NULL) return CMD_ERROR; |
| 0 | 651 |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
652 |
if (flags & DC_EXEC) {
|
|
2425
e755ee29133a
(svn r2951) - Fix: [ 1259345 ] Changing engine in netgame opens train window for everyone
Darkvater
parents:
2422
diff
changeset
|
653 |
if (IsLocalPlayer()) _last_built_road_depot_tile = tile; |
| 0 | 654 |
|
655 |
dep->xy = tile; |
|
656 |
dep->town_index = ClosestTownFromTile(tile, (uint)-1)->index; |
|
657 |
||
658 |
ModifyTile(tile, |
|
659 |
MP_SETTYPE(MP_STREET) | |
|
660 |
MP_MAPOWNER_CURRENT | MP_MAP5, |
|
661 |
(p1 | 0x20) /* map5 */ |
|
662 |
); |
|
663 |
||
664 |
} |
|
665 |
return cost + _price.build_road_depot; |
|
666 |
} |
|
667 |
||
|
1979
82d8bcc16ce2
(svn r2485) Missed two uint -> TileIndex, thanks _Luca_
tron
parents:
1977
diff
changeset
|
668 |
static int32 RemoveRoadDepot(TileIndex tile, uint32 flags) |
| 0 | 669 |
{
|
|
149
5f7d4b21df01
(svn r150) -Fix: [1010833] Turning on the magic bulldozer removes oil rigs
darkvater
parents:
84
diff
changeset
|
670 |
if (!CheckTileOwnership(tile) && _current_player != OWNER_WATER) |
| 0 | 671 |
return CMD_ERROR; |
672 |
||
| 2639 | 673 |
if (!EnsureNoVehicle(tile)) return CMD_ERROR; |
| 0 | 674 |
|
| 2639 | 675 |
if (flags & DC_EXEC) DoDeleteDepot(tile); |
| 0 | 676 |
|
677 |
return _price.remove_road_depot; |
|
678 |
} |
|
679 |
||
680 |
#define M(x) (1<<(x)) |
|
681 |
||
|
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
682 |
static int32 ClearTile_Road(TileIndex tile, byte flags) |
|
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
683 |
{
|
| 0 | 684 |
int32 ret; |
|
2049
538e73c53f54
(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
|
685 |
byte m5 = _m[tile].m5; |
| 0 | 686 |
|
687 |
if ( (m5 & 0xF0) == 0) {
|
|
688 |
byte b = m5 & 0xF; |
|
689 |
||
690 |
if (! ((1 << b) & (M(1)|M(2)|M(4)|M(8))) ) {
|
|
|
1901
03bf9bf99319
(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
|
691 |
if ((!(flags & DC_AI_BUILDING) || !IsTileOwner(tile, OWNER_TOWN)) && flags & DC_AUTO) |
| 0 | 692 |
return_cmd_error(STR_1801_MUST_REMOVE_ROAD_FIRST); |
693 |
} |
|
694 |
return DoCommandByTile(tile, b, 0, flags, CMD_REMOVE_ROAD); |
|
695 |
} else if ( (m5 & 0xE0) == 0) {
|
|
696 |
if (flags & DC_AUTO) |
|
697 |
return_cmd_error(STR_1801_MUST_REMOVE_ROAD_FIRST); |
|
698 |
||
699 |
ret = DoCommandByTile(tile, (m5&8)?5:10, 0, flags, CMD_REMOVE_ROAD); |
|
|
2737
fb1556b8f5e0
(svn r3282) - Codechange: Replace tests against CMD_ERROR with CmdFailed()
peter1138
parents:
2709
diff
changeset
|
700 |
if (CmdFailed(ret)) return CMD_ERROR; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
701 |
|
| 0 | 702 |
if (flags & DC_EXEC) {
|
703 |
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
|
704 |
} |
| 0 | 705 |
|
706 |
return ret; |
|
707 |
} else {
|
|
708 |
if (flags & DC_AUTO) |
|
709 |
return_cmd_error(STR_2004_BUILDING_MUST_BE_DEMOLISHED); |
|
710 |
return RemoveRoadDepot(tile,flags); |
|
711 |
} |
|
712 |
} |
|
713 |
||
714 |
||
715 |
typedef struct DrawRoadTileStruct {
|
|
716 |
uint16 image; |
|
717 |
byte subcoord_x; |
|
718 |
byte subcoord_y; |
|
719 |
} DrawRoadTileStruct; |
|
720 |
||
721 |
typedef struct DrawRoadSeqStruct {
|
|
722 |
uint32 image; |
|
723 |
byte subcoord_x; |
|
724 |
byte subcoord_y; |
|
725 |
byte width; |
|
726 |
byte height; |
|
727 |
} DrawRoadSeqStruct; |
|
728 |
||
729 |
#include "table/road_land.h" |
|
730 |
||
731 |
||
|
2548
49c8a096033f
(svn r3077) static, const, bracing, indentation, 0 -> '\0'/NULL, typos in comments, excess empty lines, minor other changes
tron
parents:
2544
diff
changeset
|
732 |
uint GetRoadFoundation(uint tileh, uint bits) |
|
49c8a096033f
(svn r3077) static, const, bracing, indentation, 0 -> '\0'/NULL, typos in comments, excess empty lines, minor other changes
tron
parents:
2544
diff
changeset
|
733 |
{
|
| 0 | 734 |
int i; |
735 |
// normal level sloped building |
|
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
736 |
if ((~_valid_tileh_slopes_road[1][tileh] & bits) == 0) return tileh; |
| 0 | 737 |
|
738 |
// inclined sloped building |
|
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
739 |
if (( |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
740 |
(i = 0, tileh == 1) || |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
741 |
(i += 2, tileh == 2) || |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
742 |
(i += 2, tileh == 4) || |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
743 |
(i += 2, tileh == 8) |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
744 |
) && ( |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
745 |
( bits == (ROAD_SW | ROAD_NE)) || |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
746 |
(i++, bits == (ROAD_NW | ROAD_SE)) |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
747 |
)) {
|
| 0 | 748 |
return i + 15; |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
749 |
} |
| 0 | 750 |
|
|
13
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
751 |
// rail crossing |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
752 |
if ((bits & 0x10) && _valid_tileh_slopes_road[2][tileh]) return tileh; |
|
13
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 |
||
|
2471
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
764 |
/** |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
765 |
* Draw ground sprite and road pieces |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
766 |
* @param ti TileInfo |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
767 |
* @param road RoadBits to draw |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
768 |
* @param ground_type Ground type |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
769 |
* @param snow Draw snow |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
770 |
* @param flat Draw foundation |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
771 |
*/ |
| 2817 | 772 |
static void DrawRoadBits(TileInfo *ti, byte road, byte ground_type, bool snow, bool flat) |
|
2471
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
773 |
{
|
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
774 |
const DrawRoadTileStruct *drts; |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
775 |
PalSpriteID image = 0; |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
776 |
|
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
777 |
if (ti->tileh != 0) {
|
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
778 |
int foundation; |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
779 |
if (flat) {
|
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
780 |
foundation = ti->tileh; |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
781 |
} else {
|
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
782 |
foundation = GetRoadFoundation(ti->tileh, road); |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
783 |
} |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
784 |
|
| 2639 | 785 |
if (foundation != 0) DrawFoundation(ti, foundation); |
|
2471
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
786 |
|
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
787 |
// DrawFoundation() modifies ti. |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
788 |
// Default sloped sprites.. |
| 2639 | 789 |
if (ti->tileh != 0) image = _road_sloped_sprites[ti->tileh - 1] + 0x53F; |
|
2471
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
790 |
} |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
791 |
|
| 2639 | 792 |
if (image == 0) image = _road_tile_sprites_1[road]; |
|
2471
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
793 |
|
| 2639 | 794 |
if (ground_type == 0) image |= PALETTE_TO_BARE_LAND; |
|
2471
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
795 |
|
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
796 |
if (snow) {
|
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
797 |
image += 19; |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
798 |
} else if (ground_type > 1 && ground_type != 6) {
|
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
799 |
// Pavement tiles. |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
800 |
image -= 19; |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
801 |
} |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
802 |
|
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
803 |
DrawGroundSprite(image); |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
804 |
|
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
805 |
// Return if full detail is disabled, or we are zoomed fully out. |
| 2639 | 806 |
if (!(_display_opt & DO_FULL_DETAIL) || _cur_dpi->zoom == 2) return; |
|
2471
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
807 |
|
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
808 |
if (ground_type >= 6) {
|
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
809 |
// Road works |
| 2872 | 810 |
DrawGroundSprite(HASBIT(road, 3) ? SPR_EXCAVATION_X : SPR_EXCAVATION_Y); |
|
2471
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
811 |
return; |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
812 |
} |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
813 |
|
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
814 |
// Draw extra details. |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
815 |
for (drts = _road_display_table[ground_type][road]; drts->image != 0; drts++) {
|
|
2471
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
816 |
int x = ti->x | drts->subcoord_x; |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
817 |
int y = ti->y | drts->subcoord_y; |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
818 |
byte z = ti->z; |
| 2639 | 819 |
if (ti->tileh != 0) z = GetSlopeZ(x, y); |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
820 |
AddSortableSpriteToDraw(drts->image, x, y, 2, 2, 0x10, z); |
|
2471
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
821 |
} |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
822 |
} |
|
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
823 |
|
| 0 | 824 |
static void DrawTile_Road(TileInfo *ti) |
825 |
{
|
|
|
2471
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
826 |
PalSpriteID image; |
|
817
238bbdaa228b
(svn r1288) -Codechange: changed _map2 to an uint16. It is still saved and loaded as
truelight
parents:
679
diff
changeset
|
827 |
uint16 m2; |
| 0 | 828 |
|
829 |
if ( (ti->map5 & 0xF0) == 0) { // if it is a road the upper 4 bits are 0
|
|
|
2471
5935596f14a8
(svn r2997) -Codechange: Split road drawing code off from DrawTile_Road into a separate function to be used elsewhere.
peter1138
parents:
2469
diff
changeset
|
830 |
DrawRoadBits(ti, GB(ti->map5, 0, 4), GB(_m[ti->tile].m4, 4, 3), HASBIT(_m[ti->tile].m4, 7), false); |
|
13
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
831 |
} else if ( (ti->map5 & 0xE0) == 0) { // railroad crossing
|
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
832 |
int f = GetRoadFoundation(ti->tileh, ti->map5 & 0xF); |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
833 |
if (f) DrawFoundation(ti, f); |
|
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
834 |
|
|
2511
3eb6cb6b750d
(svn r3037) Don't deduce the sprites for tunnels and level crossings from magic numbers, but fetch them from the central rail info array. This is a preparation step for electrified rails
tron
parents:
2502
diff
changeset
|
835 |
image = GetRailTypeInfo(GB(_m[ti->tile].m4, 0, 4))->base_sprites.crossing; |
| 0 | 836 |
|
|
2511
3eb6cb6b750d
(svn r3037) Don't deduce the sprites for tunnels and level crossings from magic numbers, but fetch them from the central rail info array. This is a preparation step for electrified rails
tron
parents:
2502
diff
changeset
|
837 |
if (GB(ti->map5, 3, 1) == 0) image++; /* direction */ |
| 0 | 838 |
|
839 |
if ( (ti->map5 & 4) != 0) |
|
840 |
image += 2; |
|
841 |
||
|
2049
538e73c53f54
(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
|
842 |
if ( _m[ti->tile].m4 & 0x80) {
|
| 0 | 843 |
image += 8; |
844 |
} else {
|
|
|
2140
a04d0142ad65
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
tron
parents:
2133
diff
changeset
|
845 |
m2 = GB(_m[ti->tile].m4, 4, 3); |
|
2187
a0e206ce9fbf
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
celestar
parents:
2186
diff
changeset
|
846 |
if (m2 == 0) image |= PALETTE_TO_BARE_LAND; |
| 0 | 847 |
if (m2 > 1) image += 4; |
848 |
} |
|
849 |
||
|
2511
3eb6cb6b750d
(svn r3037) Don't deduce the sprites for tunnels and level crossings from magic numbers, but fetch them from the central rail info array. This is a preparation step for electrified rails
tron
parents:
2502
diff
changeset
|
850 |
DrawGroundSprite(image); |
| 0 | 851 |
} else {
|
852 |
uint32 ormod; |
|
| 2544 | 853 |
PlayerID player; |
| 0 | 854 |
const DrawRoadSeqStruct *drss; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
855 |
|
| 0 | 856 |
if (ti->tileh != 0) { DrawFoundation(ti, ti->tileh); }
|
857 |
||
|
2187
a0e206ce9fbf
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
celestar
parents:
2186
diff
changeset
|
858 |
ormod = PALETTE_TO_GREY; //was this a bug/problem? |
|
1901
03bf9bf99319
(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
|
859 |
player = GetTileOwner(ti->tile); |
| 0 | 860 |
if (player < MAX_PLAYERS) |
861 |
ormod = PLAYER_SPRITE_COLOR(player); |
|
862 |
||
| 1398 | 863 |
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
|
864 |
|
| 1398 | 865 |
DrawGroundSprite(drss++->image); |
| 0 | 866 |
|
| 1398 | 867 |
for (; drss->image != 0; drss++) {
|
868 |
uint32 image = drss->image; |
|
869 |
||
|
2187
a0e206ce9fbf
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
celestar
parents:
2186
diff
changeset
|
870 |
if (image & PALETTE_MODIFIER_COLOR) |
| 0 | 871 |
image |= ormod; |
|
497
4d1c889526ee
(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
|
872 |
if (_display_opt & DO_TRANS_BUILDINGS) // show transparent depots |
|
2148
542ea702738c
(svn r2658) -Codechange: Use MAKE_TRANSPARENT to display a transparented sprite
celestar
parents:
2140
diff
changeset
|
873 |
MAKE_TRANSPARENT(image); |
| 0 | 874 |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
875 |
AddSortableSpriteToDraw(image, ti->x | drss->subcoord_x, |
| 0 | 876 |
ti->y | drss->subcoord_y, drss->width, drss->height, 0x14, ti->z); |
877 |
} |
|
878 |
} |
|
879 |
} |
|
880 |
||
881 |
void DrawRoadDepotSprite(int x, int y, int image) |
|
882 |
{
|
|
883 |
uint32 ormod; |
|
884 |
const DrawRoadSeqStruct *dtss; |
|
885 |
||
886 |
ormod = PLAYER_SPRITE_COLOR(_local_player); |
|
887 |
||
| 1398 | 888 |
dtss = _road_display_datas[image]; |
| 0 | 889 |
|
| 2639 | 890 |
x += 33; |
891 |
y += 17; |
|
| 0 | 892 |
|
| 1398 | 893 |
DrawSprite(dtss++->image, x, y); |
| 0 | 894 |
|
| 2952 | 895 |
for (; dtss->image != 0; dtss++) {
|
| 0 | 896 |
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
|
897 |
|
| 0 | 898 |
image = dtss->image; |
| 2639 | 899 |
if (image & PALETTE_MODIFIER_COLOR) image |= ormod; |
| 0 | 900 |
|
901 |
DrawSprite(image, x + pt.x, y + pt.y); |
|
902 |
} |
|
903 |
} |
|
904 |
||
| 2537 | 905 |
static uint GetSlopeZ_Road(const TileInfo* ti) |
| 0 | 906 |
{
|
907 |
uint z = ti->z; |
|
908 |
int th = ti->tileh; |
|
909 |
||
910 |
// check if it's a foundation |
|
911 |
if (ti->tileh != 0) {
|
|
|
13
3e7c1f74a996
(svn r14) Fix: railroad crossings on slopes are now possible
dominik
parents:
0
diff
changeset
|
912 |
if ((ti->map5 & 0xE0) == 0) { /* road or crossing */
|
| 0 | 913 |
uint f = GetRoadFoundation(ti->tileh, ti->map5 & 0x3F); |
914 |
if (f != 0) {
|
|
915 |
if (f < 15) {
|
|
916 |
// leveled foundation |
|
917 |
return z + 8; |
|
918 |
} |
|
919 |
// inclined foundation |
|
920 |
th = _inclined_tileh[f - 15]; |
|
921 |
} |
|
922 |
} else if ((ti->map5 & 0xF0) == 0x20) {
|
|
923 |
// depot |
|
924 |
return z + 8; |
|
925 |
} |
|
926 |
return GetPartialZ(ti->x&0xF, ti->y&0xF, th) + z; |
|
927 |
} |
|
| 39 | 928 |
return z; // normal Z if no slope |
929 |
} |
|
930 |
||
|
2436
7d5df545bd5d
(svn r2962) - const correctness for all Get* functions and most Draw* functions that don't change their pointer parameters
Darkvater
parents:
2425
diff
changeset
|
931 |
static uint GetSlopeTileh_Road(const TileInfo *ti) |
| 39 | 932 |
{
|
933 |
// check if it's a foundation |
|
934 |
if (ti->tileh != 0) {
|
|
935 |
if ((ti->map5 & 0xE0) == 0) { /* road or crossing */
|
|
936 |
uint f = GetRoadFoundation(ti->tileh, ti->map5 & 0x3F); |
|
937 |
if (f != 0) {
|
|
938 |
if (f < 15) {
|
|
939 |
// leveled foundation |
|
940 |
return 0; |
|
941 |
} |
|
942 |
// inclined foundation |
|
943 |
return _inclined_tileh[f - 15]; |
|
944 |
} |
|
945 |
} else if ((ti->map5 & 0xF0) == 0x20) {
|
|
946 |
// depot |
|
947 |
return 0; |
|
948 |
} |
|
949 |
} |
|
950 |
return ti->tileh; |
|
| 0 | 951 |
} |
952 |
||
|
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
953 |
static void GetAcceptedCargo_Road(TileIndex tile, AcceptedCargo ac) |
| 0 | 954 |
{
|
955 |
/* not used */ |
|
956 |
} |
|
957 |
||
|
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
958 |
static void AnimateTile_Road(TileIndex tile) |
| 0 | 959 |
{
|
| 2639 | 960 |
if (IsLevelCrossing(tile)) MarkTileDirtyByTile(tile); |
| 0 | 961 |
} |
962 |
||
963 |
static const byte _town_road_types[5][2] = {
|
|
964 |
{1,1},
|
|
965 |
{2,2},
|
|
966 |
{2,2},
|
|
967 |
{5,5},
|
|
968 |
{3,2},
|
|
969 |
}; |
|
970 |
||
971 |
static const byte _town_road_types_2[5][2] = {
|
|
972 |
{1,1},
|
|
973 |
{2,2},
|
|
974 |
{3,2},
|
|
975 |
{3,2},
|
|
976 |
{3,2},
|
|
977 |
}; |
|
978 |
||
979 |
||
|
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
980 |
static void TileLoop_Road(TileIndex tile) |
| 0 | 981 |
{
|
982 |
Town *t; |
|
983 |
int grp; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
984 |
|
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
985 |
switch (_opt.landscape) {
|
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
986 |
case LT_HILLY: |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
987 |
if ((_m[tile].m4 & 0x80) != (GetTileZ(tile) > _opt.snow_line ? 0x80 : 0x00)) {
|
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
988 |
_m[tile].m4 ^= 0x80; |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
989 |
MarkTileDirtyByTile(tile); |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
990 |
} |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
991 |
break; |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
992 |
|
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
993 |
case LT_DESERT: |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
994 |
if (GetMapExtraBits(tile) == 1 && !(_m[tile].m4 & 0x80)) {
|
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
995 |
_m[tile].m4 |= 0x80; |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
996 |
MarkTileDirtyByTile(tile); |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
997 |
} |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
998 |
break; |
| 0 | 999 |
} |
1000 |
||
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
1001 |
if (_m[tile].m5 & 0xE0) return; |
| 0 | 1002 |
|
|
2140
a04d0142ad65
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
tron
parents:
2133
diff
changeset
|
1003 |
if (GB(_m[tile].m4, 4, 3) < 6) {
|
|
1281
dd226de69402
(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
33a251c30758
(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
3822f77cbc53
(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) && |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
1013 |
(_m[tile].m5 == 5 || _m[tile].m5 == 10)) {
|
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
1014 |
if (GetTileSlope(tile, NULL) == 0 && EnsureNoVehicle(tile) && CHANCE16(1, 20)) {
|
|
2140
a04d0142ad65
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
tron
parents:
2133
diff
changeset
|
1015 |
_m[tile].m4 |= (GB(_m[tile].m4, 4, 3) <= 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
a6d140a6a4de
(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, |
|
a6d140a6a4de
(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
52782e5cf7c9
(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]; |
|
|
2140
a04d0142ad65
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
tron
parents:
2133
diff
changeset
|
1031 |
byte b = GB(_m[tile].m4, 4, 3); |
| 0 | 1032 |
|
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
1033 |
if (b == p[0]) return; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1034 |
|
| 0 | 1035 |
if (b == p[1]) {
|
1036 |
b = p[0]; |
|
1037 |
} else if (b == 0) {
|
|
1038 |
b = p[1]; |
|
1039 |
} else {
|
|
1040 |
b = 0; |
|
1041 |
} |
|
|
2493
f6b4300cc2b0
(svn r3019) -Codechange: Replace explicit shifting/anding/oring with GB and SB
tron
parents:
2471
diff
changeset
|
1042 |
SB(_m[tile].m4, 4, 3, b); |
| 0 | 1043 |
MarkTileDirtyByTile(tile); |
1044 |
} |
|
1045 |
} else {
|
|
1046 |
// Handle road work |
|
|
1264
acebb2b01e32
(svn r1768) -Codechange: Store town index in _map2 of town tiles
celestar
parents:
1247
diff
changeset
|
1047 |
//XXX undocumented |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1048 |
|
|
2049
538e73c53f54
(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
|
1049 |
byte b = _m[tile].m4; |
|
1264
acebb2b01e32
(svn r1768) -Codechange: Store town index in _map2 of town tiles
celestar
parents:
1247
diff
changeset
|
1050 |
//roadworks take place only |
|
acebb2b01e32
(svn r1768) -Codechange: Store town index in _map2 of town tiles
celestar
parents:
1247
diff
changeset
|
1051 |
//keep roadworks running for 16 loops |
|
acebb2b01e32
(svn r1768) -Codechange: Store town index in _map2 of town tiles
celestar
parents:
1247
diff
changeset
|
1052 |
//lower 4 bits of map3_hi store the counter now |
|
acebb2b01e32
(svn r1768) -Codechange: Store town index in _map2 of town tiles
celestar
parents:
1247
diff
changeset
|
1053 |
if ((b & 0xF) != 0xF) {
|
|
2049
538e73c53f54
(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
|
1054 |
_m[tile].m4 = b + 1; |
| 0 | 1055 |
return; |
1056 |
} |
|
|
1264
acebb2b01e32
(svn r1768) -Codechange: Store town index in _map2 of town tiles
celestar
parents:
1247
diff
changeset
|
1057 |
//roadworks finished |
|
2140
a04d0142ad65
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
tron
parents:
2133
diff
changeset
|
1058 |
_m[tile].m4 = (GB(b, 4, 3) == 6 ? 1 : 2) << 4; |
| 0 | 1059 |
MarkTileDirtyByTile(tile); |
1060 |
} |
|
1061 |
} |
|
1062 |
||
|
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
1063 |
void ShowRoadDepotWindow(TileIndex tile); |
| 0 | 1064 |
|
|
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
1065 |
static void ClickTile_Road(TileIndex tile) |
| 0 | 1066 |
{
|
|
2493
f6b4300cc2b0
(svn r3019) -Codechange: Replace explicit shifting/anding/oring with GB and SB
tron
parents:
2471
diff
changeset
|
1067 |
if (GB(_m[tile].m5, 4, 4) == 2) ShowRoadDepotWindow(tile); |
| 0 | 1068 |
} |
1069 |
||
1070 |
static const byte _road_trackbits[16] = {
|
|
1071 |
0x0, 0x0, 0x0, 0x10, 0x0, 0x2, 0x8, 0x1A, 0x0, 0x4, 0x1, 0x15, 0x20, 0x26, 0x29, 0x3F, |
|
1072 |
}; |
|
1073 |
||
|
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
1074 |
static uint32 GetTileTrackStatus_Road(TileIndex tile, TransportType mode) |
|
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
1075 |
{
|
|
159
139cf78bfb28
(svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs)
truelight
parents:
149
diff
changeset
|
1076 |
if (mode == TRANSPORT_RAIL) {
|
|
1927
1181e7652e2f
(svn r2433) - CodeChange: unmagicify all road/train crossings with IsLevelCrossing() function (peter1138)
Darkvater
parents:
1902
diff
changeset
|
1077 |
if (!IsLevelCrossing(tile)) |
| 0 | 1078 |
return 0; |
|
2049
538e73c53f54
(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
|
1079 |
return _m[tile].m5 & 8 ? 0x101 : 0x202; |
|
159
139cf78bfb28
(svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs)
truelight
parents:
149
diff
changeset
|
1080 |
} else if (mode == TRANSPORT_ROAD) {
|
|
2049
538e73c53f54
(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
|
1081 |
byte b = _m[tile].m5; |
| 0 | 1082 |
if ((b & 0xF0) == 0) {
|
|
159
139cf78bfb28
(svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs)
truelight
parents:
149
diff
changeset
|
1083 |
/* Ordinary road */ |
|
2140
a04d0142ad65
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
tron
parents:
2133
diff
changeset
|
1084 |
if (!_road_special_gettrackstatus && GB(_m[tile].m4, 4, 3) >= 6) |
| 0 | 1085 |
return 0; |
1086 |
return _road_trackbits[b&0xF] * 0x101; |
|
|
1927
1181e7652e2f
(svn r2433) - CodeChange: unmagicify all road/train crossings with IsLevelCrossing() function (peter1138)
Darkvater
parents:
1902
diff
changeset
|
1087 |
} else if (IsLevelCrossing(tile)) {
|
|
159
139cf78bfb28
(svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs)
truelight
parents:
149
diff
changeset
|
1088 |
/* Crossing */ |
| 0 | 1089 |
uint32 r = 0x101; |
1090 |
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
|
1091 |
|
| 0 | 1092 |
if (b&4) {
|
1093 |
r *= 0x10001; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1094 |
} |
| 0 | 1095 |
return r; |
1096 |
} |
|
1097 |
} |
|
1098 |
return 0; |
|
1099 |
} |
|
1100 |
||
1101 |
static const StringID _road_tile_strings[] = {
|
|
1102 |
STR_1818_ROAD_RAIL_LEVEL_CROSSING, |
|
1103 |
STR_1817_ROAD_VEHICLE_DEPOT, |
|
1104 |
||
1105 |
STR_1814_ROAD, |
|
1106 |
STR_1814_ROAD, |
|
1107 |
STR_1814_ROAD, |
|
1108 |
STR_1815_ROAD_WITH_STREETLIGHTS, |
|
1109 |
STR_1814_ROAD, |
|
1110 |
STR_1816_TREE_LINED_ROAD, |
|
1111 |
STR_1814_ROAD, |
|
1112 |
STR_1814_ROAD, |
|
1113 |
}; |
|
1114 |
||
|
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
1115 |
static void GetTileDesc_Road(TileIndex tile, TileDesc *td) |
| 0 | 1116 |
{
|
| 2989 | 1117 |
int i = GB(_m[tile].m5, 4, 4); |
1118 |
if (i == 0) i = GB(_m[tile].m4, 4, 3) + 3; |
|
| 0 | 1119 |
td->str = _road_tile_strings[i - 1]; |
|
1901
03bf9bf99319
(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
|
1120 |
td->owner = GetTileOwner(tile); |
| 0 | 1121 |
} |
1122 |
||
1123 |
static const byte _roadveh_enter_depot_unk0[4] = {
|
|
1124 |
8, 9, 0, 1 |
|
1125 |
}; |
|
1126 |
||
|
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
1127 |
static uint32 VehicleEnter_Road(Vehicle *v, TileIndex tile, int x, int y) |
| 0 | 1128 |
{
|
|
1927
1181e7652e2f
(svn r2433) - CodeChange: unmagicify all road/train crossings with IsLevelCrossing() function (peter1138)
Darkvater
parents:
1902
diff
changeset
|
1129 |
if (IsLevelCrossing(tile)) {
|
|
2493
f6b4300cc2b0
(svn r3019) -Codechange: Replace explicit shifting/anding/oring with GB and SB
tron
parents:
2471
diff
changeset
|
1130 |
if (v->type == VEH_Train && GB(_m[tile].m5, 2, 1) == 0) {
|
| 0 | 1131 |
/* train crossing a road */ |
| 541 | 1132 |
SndPlayVehicleFx(SND_0E_LEVEL_CROSSING, v); |
|
2493
f6b4300cc2b0
(svn r3019) -Codechange: Replace explicit shifting/anding/oring with GB and SB
tron
parents:
2471
diff
changeset
|
1133 |
SB(_m[tile].m5, 2, 1, 1); |
| 0 | 1134 |
MarkTileDirtyByTile(tile); |
1135 |
} |
|
|
2493
f6b4300cc2b0
(svn r3019) -Codechange: Replace explicit shifting/anding/oring with GB and SB
tron
parents:
2471
diff
changeset
|
1136 |
} else if (GB(_m[tile].m5, 4, 4) == 2) {
|
| 0 | 1137 |
if (v->type == VEH_Road && v->u.road.frame == 11) {
|
|
2493
f6b4300cc2b0
(svn r3019) -Codechange: Replace explicit shifting/anding/oring with GB and SB
tron
parents:
2471
diff
changeset
|
1138 |
if (_roadveh_enter_depot_unk0[GB(_m[tile].m5, 0, 2)] == v->u.road.state) {
|
| 0 | 1139 |
RoadVehEnterDepot(v); |
1140 |
return 4; |
|
1141 |
} |
|
1142 |
} |
|
1143 |
} |
|
1144 |
return 0; |
|
1145 |
} |
|
1146 |
||
|
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
1147 |
static void VehicleLeave_Road(Vehicle *v, TileIndex tile, int x, int y) |
| 0 | 1148 |
{
|
|
1927
1181e7652e2f
(svn r2433) - CodeChange: unmagicify all road/train crossings with IsLevelCrossing() function (peter1138)
Darkvater
parents:
1902
diff
changeset
|
1149 |
if (IsLevelCrossing(tile) && v->type == VEH_Train && v->next == NULL) {
|
|
1181e7652e2f
(svn r2433) - CodeChange: unmagicify all road/train crossings with IsLevelCrossing() function (peter1138)
Darkvater
parents:
1902
diff
changeset
|
1150 |
// Turn off level crossing lights |
|
2493
f6b4300cc2b0
(svn r3019) -Codechange: Replace explicit shifting/anding/oring with GB and SB
tron
parents:
2471
diff
changeset
|
1151 |
SB(_m[tile].m5, 2, 1, 0); |
| 0 | 1152 |
MarkTileDirtyByTile(tile); |
1153 |
} |
|
1154 |
} |
|
1155 |
||
|
2436
7d5df545bd5d
(svn r2962) - const correctness for all Get* functions and most Draw* functions that don't change their pointer parameters
Darkvater
parents:
2425
diff
changeset
|
1156 |
static void ChangeTileOwner_Road(TileIndex tile, PlayerID old_player, PlayerID new_player) |
| 0 | 1157 |
{
|
1158 |
// road/rail crossing where the road is owned by the current player? |
|
|
2049
538e73c53f54
(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
|
1159 |
if (old_player == _m[tile].m3 && IsLevelCrossing(tile)) {
|
|
2469
59a0073914d8
(svn r2995) Replace 0xFF/0xFFFF with CT_INVALID/OWNER_SPECTATOR/INVALID_STATION where appropriate
tron
parents:
2436
diff
changeset
|
1160 |
_m[tile].m3 = (new_player == OWNER_SPECTATOR) ? OWNER_NONE : new_player; |
| 0 | 1161 |
} |
1162 |
||
|
1901
03bf9bf99319
(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
|
1163 |
if (!IsTileOwner(tile, old_player)) return; |
| 0 | 1164 |
|
| 2502 | 1165 |
if (new_player != OWNER_SPECTATOR) {
|
| 1902 | 1166 |
SetTileOwner(tile, new_player); |
| 0 | 1167 |
} else {
|
|
2493
f6b4300cc2b0
(svn r3019) -Codechange: Replace explicit shifting/anding/oring with GB and SB
tron
parents:
2471
diff
changeset
|
1168 |
if (GB(_m[tile].m5, 4, 4) == 0) {
|
| 1902 | 1169 |
SetTileOwner(tile, OWNER_NONE); |
|
1927
1181e7652e2f
(svn r2433) - CodeChange: unmagicify all road/train crossings with IsLevelCrossing() function (peter1138)
Darkvater
parents:
1902
diff
changeset
|
1170 |
} else if (IsLevelCrossing(tile)) {
|
|
2049
538e73c53f54
(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
|
1171 |
_m[tile].m5 = (_m[tile].m5&8) ? 0x5 : 0xA; |
|
538e73c53f54
(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
|
1172 |
SetTileOwner(tile, _m[tile].m3); |
|
538e73c53f54
(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
|
1173 |
_m[tile].m3 = 0; |
|
538e73c53f54
(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 |
_m[tile].m4 &= 0x80; |
| 0 | 1175 |
} else {
|
1176 |
DoCommandByTile(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR); |
|
1177 |
} |
|
1178 |
} |
|
1179 |
} |
|
1180 |
||
|
1093
4fdc46eaf423
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1059
diff
changeset
|
1181 |
void InitializeRoad(void) |
| 0 | 1182 |
{
|
1183 |
_last_built_road_depot_tile = 0; |
|
1184 |
} |
|
1185 |
||
1186 |
const TileTypeProcs _tile_type_road_procs = {
|
|
1187 |
DrawTile_Road, /* draw_tile_proc */ |
|
1188 |
GetSlopeZ_Road, /* get_slope_z_proc */ |
|
1189 |
ClearTile_Road, /* clear_tile_proc */ |
|
1190 |
GetAcceptedCargo_Road, /* get_accepted_cargo_proc */ |
|
1191 |
GetTileDesc_Road, /* get_tile_desc_proc */ |
|
1192 |
GetTileTrackStatus_Road, /* get_tile_track_status_proc */ |
|
1193 |
ClickTile_Road, /* click_tile_proc */ |
|
1194 |
AnimateTile_Road, /* animate_tile_proc */ |
|
1195 |
TileLoop_Road, /* tile_loop_clear */ |
|
1196 |
ChangeTileOwner_Road, /* change_tile_owner_clear */ |
|
1197 |
NULL, /* get_produced_cargo_proc */ |
|
1198 |
VehicleEnter_Road, /* vehicle_enter_tile_proc */ |
|
1199 |
VehicleLeave_Road, /* vehicle_leave_tile_proc */ |
|
| 39 | 1200 |
GetSlopeTileh_Road, /* get_slope_tileh_proc */ |
| 0 | 1201 |
}; |