author | celestar |
Sat, 30 Dec 2006 17:09:30 +0000 | |
branch | custombridgeheads |
changeset 5606 | a8e391b7b10a |
parent 5593 | 3e0dd1f014ca |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
0 | 3 |
#include "stdafx.h" |
1891
92a3b0aa0946
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1793
diff
changeset
|
4 |
#include "openttd.h" |
5573
afa6f92a71fd
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
4990
diff
changeset
|
5 |
#include "bridge_map.h" |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
6 |
#include "heightmap.h" |
3144
426b825578f9
(svn r3763) Adapt to the new 'map accessors go in foo_map.h'-scheme
tron
parents:
3111
diff
changeset
|
7 |
#include "clear_map.h" |
2163
637ec3c361f5
(svn r2673) Include functions.h directly, not globally via openttd.h
tron
parents:
2159
diff
changeset
|
8 |
#include "functions.h" |
679
e959706a3e4d
(svn r1117) Move map arrays and some related macros into their own files map.c and map.h
tron
parents:
473
diff
changeset
|
9 |
#include "map.h" |
2154
63a6b880b4c0
(svn r2664) Remove depedency on player.h from variables.h
tron
parents:
2150
diff
changeset
|
10 |
#include "player.h" |
1349
07514c2cc6d1
(svn r1853) Move spritecache function declarations into a header of their own and use SpriteID as parameter type where appropriate
tron
parents:
1335
diff
changeset
|
11 |
#include "spritecache.h" |
1363
01d3de5d8039
(svn r1867) Include tables/sprites.h only in files which need it
tron
parents:
1359
diff
changeset
|
12 |
#include "table/sprites.h" |
1209
a1ac96655b79
(svn r1713) Split off several functions which query/set information about a single tile from map.h and put them into a seperate file tile.h
tron
parents:
1202
diff
changeset
|
13 |
#include "tile.h" |
0 | 14 |
#include <stdarg.h> |
15 |
#include "viewport.h" |
|
16 |
#include "command.h" |
|
17 |
#include "vehicle.h" |
|
2159
3b634157c3b2
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2154
diff
changeset
|
18 |
#include "variables.h" |
3144
426b825578f9
(svn r3763) Adapt to the new 'map accessors go in foo_map.h'-scheme
tron
parents:
3111
diff
changeset
|
19 |
#include "void_map.h" |
3111
1edf71aa942e
(svn r3714) Add functions to turn tiles into water and shore tiles
tron
parents:
3078
diff
changeset
|
20 |
#include "water_map.h" |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
21 |
#include "tgp.h" |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
22 |
#include "genworld.h" |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
23 |
#include "heightmap.h" |
0 | 24 |
|
183
ec2b02ea4c88
(svn r184) -Fix: starting a new game in DesertLandscape crashed the game
truelight
parents:
159
diff
changeset
|
25 |
extern const TileTypeProcs |
0 | 26 |
_tile_type_clear_procs, |
27 |
_tile_type_rail_procs, |
|
28 |
_tile_type_road_procs, |
|
29 |
_tile_type_town_procs, |
|
30 |
_tile_type_trees_procs, |
|
31 |
_tile_type_station_procs, |
|
32 |
_tile_type_water_procs, |
|
33 |
_tile_type_dummy_procs, |
|
34 |
_tile_type_industry_procs, |
|
5593
3e0dd1f014ca
(svn r7610) [cbh] - Codechange: Created seperate Tile Type Procs for tunnel and bridge tiles
celestar
parents:
5590
diff
changeset
|
35 |
_tile_type_tunnel_procs, |
5590
dc34c43fc3eb
(svn r7597) [cbh] - Codechange: Remove MP_TUNNELBRIDGE and introduce three new TileTypes: MP_TUNNEL, MP_STREET_BRIDGE, MP_RAILWAY_BRIDGE
celestar
parents:
5573
diff
changeset
|
36 |
_tile_type_unmovable_procs, |
5593
3e0dd1f014ca
(svn r7610) [cbh] - Codechange: Created seperate Tile Type Procs for tunnel and bridge tiles
celestar
parents:
5590
diff
changeset
|
37 |
_tile_type_bridge_procs, |
3e0dd1f014ca
(svn r7610) [cbh] - Codechange: Created seperate Tile Type Procs for tunnel and bridge tiles
celestar
parents:
5590
diff
changeset
|
38 |
_tile_type_bridge_procs; |
0 | 39 |
|
40 |
const TileTypeProcs * const _tile_type_procs[16] = { |
|
41 |
&_tile_type_clear_procs, |
|
42 |
&_tile_type_rail_procs, |
|
43 |
&_tile_type_road_procs, |
|
44 |
&_tile_type_town_procs, |
|
45 |
&_tile_type_trees_procs, |
|
46 |
&_tile_type_station_procs, |
|
47 |
&_tile_type_water_procs, |
|
48 |
&_tile_type_dummy_procs, |
|
49 |
&_tile_type_industry_procs, |
|
5593
3e0dd1f014ca
(svn r7610) [cbh] - Codechange: Created seperate Tile Type Procs for tunnel and bridge tiles
celestar
parents:
5590
diff
changeset
|
50 |
&_tile_type_tunnel_procs, |
0 | 51 |
&_tile_type_unmovable_procs, |
5593
3e0dd1f014ca
(svn r7610) [cbh] - Codechange: Created seperate Tile Type Procs for tunnel and bridge tiles
celestar
parents:
5590
diff
changeset
|
52 |
&_tile_type_bridge_procs, |
3e0dd1f014ca
(svn r7610) [cbh] - Codechange: Created seperate Tile Type Procs for tunnel and bridge tiles
celestar
parents:
5590
diff
changeset
|
53 |
&_tile_type_bridge_procs, |
5590
dc34c43fc3eb
(svn r7597) [cbh] - Codechange: Remove MP_TUNNELBRIDGE and introduce three new TileTypes: MP_TUNNEL, MP_STREET_BRIDGE, MP_RAILWAY_BRIDGE
celestar
parents:
5573
diff
changeset
|
54 |
NULL, |
dc34c43fc3eb
(svn r7597) [cbh] - Codechange: Remove MP_TUNNELBRIDGE and introduce three new TileTypes: MP_TUNNEL, MP_STREET_BRIDGE, MP_RAILWAY_BRIDGE
celestar
parents:
5573
diff
changeset
|
55 |
NULL, |
dc34c43fc3eb
(svn r7597) [cbh] - Codechange: Remove MP_TUNNELBRIDGE and introduce three new TileTypes: MP_TUNNEL, MP_STREET_BRIDGE, MP_RAILWAY_BRIDGE
celestar
parents:
5573
diff
changeset
|
56 |
NULL |
0 | 57 |
}; |
58 |
||
59 |
/* landscape slope => sprite */ |
|
60 |
const byte _tileh_to_sprite[32] = { |
|
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4300
diff
changeset
|
61 |
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 0, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4300
diff
changeset
|
62 |
0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 17, 0, 15, 18, 0, |
0 | 63 |
}; |
64 |
||
1958
625d71cd6898
(svn r2464) Move definition of _inclined_tileh out of variables.h
tron
parents:
1902
diff
changeset
|
65 |
const byte _inclined_tileh[] = { |
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4300
diff
changeset
|
66 |
SLOPE_SW, SLOPE_NW, SLOPE_SW, SLOPE_SE, SLOPE_NE, SLOPE_SE, SLOPE_NE, SLOPE_NW, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4300
diff
changeset
|
67 |
SLOPE_E, SLOPE_N, SLOPE_W, SLOPE_S, |
4253
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
68 |
SLOPE_NWS, SLOPE_WSE, SLOPE_SEN, SLOPE_ENW |
1958
625d71cd6898
(svn r2464) Move definition of _inclined_tileh out of variables.h
tron
parents:
1902
diff
changeset
|
69 |
}; |
625d71cd6898
(svn r2464) Move definition of _inclined_tileh out of variables.h
tron
parents:
1902
diff
changeset
|
70 |
|
0 | 71 |
|
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3529
diff
changeset
|
72 |
uint GetPartialZ(int x, int y, Slope corners) |
0 | 73 |
{ |
74 |
int z = 0; |
|
75 |
||
2952 | 76 |
switch (corners) { |
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3529
diff
changeset
|
77 |
case SLOPE_W: |
0 | 78 |
if (x - y >= 0) |
79 |
z = (x - y) >> 1; |
|
80 |
break; |
|
183
ec2b02ea4c88
(svn r184) -Fix: starting a new game in DesertLandscape crashed the game
truelight
parents:
159
diff
changeset
|
81 |
|
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3529
diff
changeset
|
82 |
case SLOPE_S: |
0 | 83 |
y^=0xF; |
84 |
if ( (x - y) >= 0) |
|
85 |
z = (x - y) >> 1; |
|
86 |
break; |
|
87 |
||
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3529
diff
changeset
|
88 |
case SLOPE_SW: |
0 | 89 |
z = (x>>1) + 1; |
90 |
break; |
|
91 |
||
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3529
diff
changeset
|
92 |
case SLOPE_E: |
0 | 93 |
if (y - x >= 0) |
94 |
z = (y - x) >> 1; |
|
95 |
break; |
|
96 |
||
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3529
diff
changeset
|
97 |
case SLOPE_EW: |
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3529
diff
changeset
|
98 |
case SLOPE_NS: |
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3529
diff
changeset
|
99 |
case SLOPE_ELEVATED: |
0 | 100 |
z = 4; |
101 |
break; |
|
102 |
||
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3529
diff
changeset
|
103 |
case SLOPE_SE: |
0 | 104 |
z = (y>>1) + 1; |
105 |
break; |
|
106 |
||
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3529
diff
changeset
|
107 |
case SLOPE_WSE: |
0 | 108 |
z = 8; |
109 |
y^=0xF; |
|
110 |
if (x - y < 0) |
|
111 |
z += (x - y) >> 1; |
|
112 |
break; |
|
113 |
||
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3529
diff
changeset
|
114 |
case SLOPE_N: |
0 | 115 |
y ^= 0xF; |
116 |
if (y - x >= 0) |
|
117 |
z = (y - x) >> 1; |
|
118 |
break; |
|
119 |
||
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3529
diff
changeset
|
120 |
case SLOPE_NW: |
0 | 121 |
z = (y^0xF)>>1; |
122 |
break; |
|
123 |
||
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3529
diff
changeset
|
124 |
case SLOPE_NWS: |
0 | 125 |
z = 8; |
126 |
if (x - y < 0) |
|
127 |
z += (x - y) >> 1; |
|
128 |
break; |
|
129 |
||
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3529
diff
changeset
|
130 |
case SLOPE_NE: |
0 | 131 |
z = (x^0xF)>>1; |
132 |
break; |
|
133 |
||
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3529
diff
changeset
|
134 |
case SLOPE_ENW: |
0 | 135 |
z = 8; |
136 |
y ^= 0xF; |
|
137 |
if (y - x < 0) |
|
138 |
z += (y - x) >> 1; |
|
139 |
break; |
|
140 |
||
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3529
diff
changeset
|
141 |
case SLOPE_SEN: |
0 | 142 |
z = 8; |
143 |
if (y - x < 0) |
|
144 |
z += (y - x) >> 1; |
|
145 |
break; |
|
146 |
||
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3529
diff
changeset
|
147 |
case SLOPE_STEEP_S: |
0 | 148 |
z = 1 + ((x+y)>>1); |
149 |
break; |
|
150 |
||
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3529
diff
changeset
|
151 |
case SLOPE_STEEP_W: |
0 | 152 |
z = 1 + ((x+(y^0xF))>>1); |
153 |
break; |
|
154 |
||
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3529
diff
changeset
|
155 |
case SLOPE_STEEP_N: |
0 | 156 |
z = 1 + (((x^0xF)+(y^0xF))>>1); |
157 |
break; |
|
183
ec2b02ea4c88
(svn r184) -Fix: starting a new game in DesertLandscape crashed the game
truelight
parents:
159
diff
changeset
|
158 |
|
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3529
diff
changeset
|
159 |
case SLOPE_STEEP_E: |
0 | 160 |
z = 1 + (((x^0xF)+(y^0xF))>>1); |
161 |
break; |
|
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3529
diff
changeset
|
162 |
|
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3529
diff
changeset
|
163 |
default: break; |
0 | 164 |
} |
165 |
||
166 |
return z; |
|
167 |
} |
|
168 |
||
2951 | 169 |
uint GetSlopeZ(int x, int y) |
0 | 170 |
{ |
4231
dea6a63dd058
(svn r5794) Pass the TileIndex plus x and y coordinates into GetSlopeZ_* instead of a TileInfo
tron
parents:
4191
diff
changeset
|
171 |
TileIndex tile = TileVirtXY(x, y); |
0 | 172 |
|
4231
dea6a63dd058
(svn r5794) Pass the TileIndex plus x and y coordinates into GetSlopeZ_* instead of a TileInfo
tron
parents:
4191
diff
changeset
|
173 |
return _tile_type_procs[GetTileType(tile)]->get_slope_z_proc(tile, x, y); |
0 | 174 |
} |
175 |
||
4061
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
176 |
|
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
177 |
static Slope GetFoundationSlope(TileIndex tile, uint* z) |
37
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
178 |
{ |
4061
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
179 |
Slope tileh = GetTileSlope(tile, z); |
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3529
diff
changeset
|
180 |
Slope slope = _tile_type_procs[GetTileType(tile)]->get_slope_tileh_proc(tile, tileh); |
50 | 181 |
|
4061
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
182 |
// Flatter slope -> higher base height |
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
183 |
if (slope < tileh) *z += TILE_HEIGHT; |
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
184 |
return slope; |
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
185 |
} |
39 | 186 |
|
4061
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
187 |
|
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
188 |
static bool HasFoundationNW(TileIndex tile, Slope slope_here, uint z_here) |
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
189 |
{ |
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
190 |
uint z; |
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
191 |
Slope slope = GetFoundationSlope(TILE_ADDXY(tile, 0, -1), &z); |
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
192 |
|
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
193 |
return |
4990
776ba4323093
(svn r6993) -Regression (r5833): Rails/roads on steep slopes incorrectly show a foundation edge if the NE/NW adjacent tile is a steep tile
tron
parents:
4344
diff
changeset
|
194 |
( |
776ba4323093
(svn r6993) -Regression (r5833): Rails/roads on steep slopes incorrectly show a foundation edge if the NE/NW adjacent tile is a steep tile
tron
parents:
4344
diff
changeset
|
195 |
z_here + (slope_here & SLOPE_N ? TILE_HEIGHT : 0) + (slope_here == SLOPE_STEEP_N ? TILE_HEIGHT : 0) > |
776ba4323093
(svn r6993) -Regression (r5833): Rails/roads on steep slopes incorrectly show a foundation edge if the NE/NW adjacent tile is a steep tile
tron
parents:
4344
diff
changeset
|
196 |
z + (slope & SLOPE_E ? TILE_HEIGHT : 0) + (slope == SLOPE_STEEP_E ? TILE_HEIGHT : 0) |
776ba4323093
(svn r6993) -Regression (r5833): Rails/roads on steep slopes incorrectly show a foundation edge if the NE/NW adjacent tile is a steep tile
tron
parents:
4344
diff
changeset
|
197 |
) || ( |
776ba4323093
(svn r6993) -Regression (r5833): Rails/roads on steep slopes incorrectly show a foundation edge if the NE/NW adjacent tile is a steep tile
tron
parents:
4344
diff
changeset
|
198 |
z_here + (slope_here & SLOPE_W ? TILE_HEIGHT : 0) + (slope_here == SLOPE_STEEP_W ? TILE_HEIGHT : 0) > |
776ba4323093
(svn r6993) -Regression (r5833): Rails/roads on steep slopes incorrectly show a foundation edge if the NE/NW adjacent tile is a steep tile
tron
parents:
4344
diff
changeset
|
199 |
z + (slope & SLOPE_S ? TILE_HEIGHT : 0) + (slope == SLOPE_STEEP_S ? TILE_HEIGHT : 0) |
776ba4323093
(svn r6993) -Regression (r5833): Rails/roads on steep slopes incorrectly show a foundation edge if the NE/NW adjacent tile is a steep tile
tron
parents:
4344
diff
changeset
|
200 |
); |
37
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
201 |
} |
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
202 |
|
4061
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
203 |
|
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
204 |
static bool HasFoundationNE(TileIndex tile, Slope slope_here, uint z_here) |
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
205 |
{ |
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
206 |
uint z; |
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
207 |
Slope slope = GetFoundationSlope(TILE_ADDXY(tile, -1, 0), &z); |
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
208 |
|
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
209 |
return |
4990
776ba4323093
(svn r6993) -Regression (r5833): Rails/roads on steep slopes incorrectly show a foundation edge if the NE/NW adjacent tile is a steep tile
tron
parents:
4344
diff
changeset
|
210 |
( |
776ba4323093
(svn r6993) -Regression (r5833): Rails/roads on steep slopes incorrectly show a foundation edge if the NE/NW adjacent tile is a steep tile
tron
parents:
4344
diff
changeset
|
211 |
z_here + (slope_here & SLOPE_N ? TILE_HEIGHT : 0) + (slope_here == SLOPE_STEEP_N ? TILE_HEIGHT : 0) > |
776ba4323093
(svn r6993) -Regression (r5833): Rails/roads on steep slopes incorrectly show a foundation edge if the NE/NW adjacent tile is a steep tile
tron
parents:
4344
diff
changeset
|
212 |
z + (slope & SLOPE_W ? TILE_HEIGHT : 0) + (slope == SLOPE_STEEP_W ? TILE_HEIGHT : 0) |
776ba4323093
(svn r6993) -Regression (r5833): Rails/roads on steep slopes incorrectly show a foundation edge if the NE/NW adjacent tile is a steep tile
tron
parents:
4344
diff
changeset
|
213 |
) || ( |
776ba4323093
(svn r6993) -Regression (r5833): Rails/roads on steep slopes incorrectly show a foundation edge if the NE/NW adjacent tile is a steep tile
tron
parents:
4344
diff
changeset
|
214 |
z_here + (slope_here & SLOPE_E ? TILE_HEIGHT : 0) + (slope_here == SLOPE_STEEP_E ? TILE_HEIGHT : 0) > |
776ba4323093
(svn r6993) -Regression (r5833): Rails/roads on steep slopes incorrectly show a foundation edge if the NE/NW adjacent tile is a steep tile
tron
parents:
4344
diff
changeset
|
215 |
z + (slope & SLOPE_S ? TILE_HEIGHT : 0) + (slope == SLOPE_STEEP_S ? TILE_HEIGHT : 0) |
776ba4323093
(svn r6993) -Regression (r5833): Rails/roads on steep slopes incorrectly show a foundation edge if the NE/NW adjacent tile is a steep tile
tron
parents:
4344
diff
changeset
|
216 |
); |
4061
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
217 |
} |
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
218 |
|
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
219 |
|
0 | 220 |
void DrawFoundation(TileInfo *ti, uint f) |
221 |
{ |
|
4240
7d001d9a5af0
(svn r5810) Shuffle some constants for clarity and remove a case which cannot occur in DrawFoundation()
tron
parents:
4238
diff
changeset
|
222 |
uint32 sprite_base = SPR_SLOPES_BASE - 15; |
4061
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
223 |
Slope slope; |
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
224 |
uint z; |
39 | 225 |
|
4061
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
226 |
slope = GetFoundationSlope(ti->tile, &z); |
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
227 |
if (!HasFoundationNW(ti->tile, slope, z)) sprite_base += 22; |
219f9d065a28
(svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents:
4000
diff
changeset
|
228 |
if (!HasFoundationNE(ti->tile, slope, z)) sprite_base += 44; |
37
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
229 |
|
4253
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
230 |
if (IsSteepSlope(ti->tileh)) { |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
231 |
uint32 lower_base; |
37
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
232 |
|
4253
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
233 |
// Lower part of foundation |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
234 |
lower_base = sprite_base; |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
235 |
if (lower_base == SPR_SLOPES_BASE - 15) lower_base = SPR_FOUNDATION_BASE; |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
236 |
AddSortableSpriteToDraw( |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
237 |
lower_base + (ti->tileh & ~SLOPE_STEEP), ti->x, ti->y, 16, 16, 7, ti->z |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
238 |
); |
3645
86af43f87885
(svn r4554) Replace magic numbers by TILE_{HEIGHT,SIZE}
tron
parents:
3636
diff
changeset
|
239 |
ti->z += TILE_HEIGHT; |
4253
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
240 |
ti->tileh = _inclined_tileh[f - 15]; |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
241 |
if (f < 15 + 8) { |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
242 |
// inclined |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
243 |
AddSortableSpriteToDraw(sprite_base + f, ti->x, ti->y, 16, 16, 1, ti->z); |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
244 |
OffsetGroundSprite(31, 9); |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
245 |
} else if (f >= 15 + 8 + 4) { |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
246 |
// three corners raised |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
247 |
uint32 upper = sprite_base + 15 + (f - 15 - 8 - 4) * 2; |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
248 |
|
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
249 |
AddSortableSpriteToDraw(upper, ti->x, ti->y, 16, 16, 1, ti->z); |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
250 |
AddChildSpriteScreen(upper + 1, 31, 9); |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
251 |
OffsetGroundSprite(31, 9); |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
252 |
} else { |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
253 |
// one corner raised |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
254 |
OffsetGroundSprite(31, 1); |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
255 |
} |
0 | 256 |
} else { |
4253
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
257 |
if (f < 15) { |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
258 |
// leveled foundation |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
259 |
// Use the original slope sprites if NW and NE borders should be visible |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
260 |
if (sprite_base == SPR_SLOPES_BASE - 15) sprite_base = SPR_FOUNDATION_BASE; |
4246
14a8849c32df
(svn r5833) -Feature: Allow building of (certain) rails, roads and bridge ramps on steep sloped tiles
tron
parents:
4240
diff
changeset
|
261 |
|
4253
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
262 |
AddSortableSpriteToDraw(sprite_base + f, ti->x, ti->y, 16, 16, 7, ti->z); |
4246
14a8849c32df
(svn r5833) -Feature: Allow building of (certain) rails, roads and bridge ramps on steep sloped tiles
tron
parents:
4240
diff
changeset
|
263 |
ti->z += TILE_HEIGHT; |
4253
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
264 |
ti->tileh = SLOPE_FLAT; |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
265 |
OffsetGroundSprite(31, 1); |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
266 |
} else { |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
267 |
// inclined foundation |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
268 |
AddSortableSpriteToDraw(sprite_base + f, ti->x, ti->y, 16, 16, 1, ti->z); |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
269 |
ti->tileh = _inclined_tileh[f - 15]; |
6fadea8a8043
(svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents:
4246
diff
changeset
|
270 |
OffsetGroundSprite(31, 9); |
4246
14a8849c32df
(svn r5833) -Feature: Allow building of (certain) rails, roads and bridge ramps on steep sloped tiles
tron
parents:
4240
diff
changeset
|
271 |
} |
0 | 272 |
} |
273 |
} |
|
274 |
||
1589
58d173b56509
(svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents:
1384
diff
changeset
|
275 |
void DoClearSquare(TileIndex tile) |
0 | 276 |
{ |
3447 | 277 |
MakeClear(tile, CLEAR_GRASS, _generating_world ? 3 : 0); |
2955
27221592ebbc
(svn r3514) -Codechange: Replace direct fiddling of bits for the ground type and density of clear tiles with symbolic names and accessors.
tron
parents:
2952
diff
changeset
|
278 |
MarkTileDirtyByTile(tile); |
0 | 279 |
} |
280 |
||
1589
58d173b56509
(svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents:
1384
diff
changeset
|
281 |
uint32 GetTileTrackStatus(TileIndex tile, TransportType mode) |
0 | 282 |
{ |
1214
33e07bbb7779
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1211
diff
changeset
|
283 |
return _tile_type_procs[GetTileType(tile)]->get_tile_track_status_proc(tile, mode); |
0 | 284 |
} |
285 |
||
1589
58d173b56509
(svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents:
1384
diff
changeset
|
286 |
void ChangeTileOwner(TileIndex tile, byte old_player, byte new_player) |
0 | 287 |
{ |
1214
33e07bbb7779
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1211
diff
changeset
|
288 |
_tile_type_procs[GetTileType(tile)]->change_tile_owner_proc(tile, old_player, new_player); |
0 | 289 |
} |
290 |
||
1589
58d173b56509
(svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents:
1384
diff
changeset
|
291 |
void GetAcceptedCargo(TileIndex tile, AcceptedCargo ac) |
0 | 292 |
{ |
293 |
memset(ac, 0, sizeof(AcceptedCargo)); |
|
1214
33e07bbb7779
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1211
diff
changeset
|
294 |
_tile_type_procs[GetTileType(tile)]->get_accepted_cargo_proc(tile, ac); |
0 | 295 |
} |
296 |
||
1589
58d173b56509
(svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents:
1384
diff
changeset
|
297 |
void AnimateTile(TileIndex tile) |
0 | 298 |
{ |
1214
33e07bbb7779
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1211
diff
changeset
|
299 |
_tile_type_procs[GetTileType(tile)]->animate_tile_proc(tile); |
0 | 300 |
} |
301 |
||
1589
58d173b56509
(svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents:
1384
diff
changeset
|
302 |
void ClickTile(TileIndex tile) |
0 | 303 |
{ |
1214
33e07bbb7779
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1211
diff
changeset
|
304 |
_tile_type_procs[GetTileType(tile)]->click_tile_proc(tile); |
0 | 305 |
} |
306 |
||
1589
58d173b56509
(svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents:
1384
diff
changeset
|
307 |
void GetTileDesc(TileIndex tile, TileDesc *td) |
0 | 308 |
{ |
1214
33e07bbb7779
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1211
diff
changeset
|
309 |
_tile_type_procs[GetTileType(tile)]->get_tile_desc_proc(tile, td); |
0 | 310 |
} |
311 |
||
1775
08ff0f12ccdc
(svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed()
Darkvater
parents:
1589
diff
changeset
|
312 |
/** Clear a piece of landscape |
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3447
diff
changeset
|
313 |
* @param tile tile to clear |
1775
08ff0f12ccdc
(svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed()
Darkvater
parents:
1589
diff
changeset
|
314 |
* @param p1 unused |
08ff0f12ccdc
(svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed()
Darkvater
parents:
1589
diff
changeset
|
315 |
* @param p2 unused |
0 | 316 |
*/ |
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3447
diff
changeset
|
317 |
int32 CmdLandscapeClear(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
0 | 318 |
{ |
319 |
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); |
|
320 |
||
1214
33e07bbb7779
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1211
diff
changeset
|
321 |
return _tile_type_procs[GetTileType(tile)]->clear_tile_proc(tile, flags); |
0 | 322 |
} |
323 |
||
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1775
diff
changeset
|
324 |
/** Clear a big piece of landscape |
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3447
diff
changeset
|
325 |
* @param tile end tile of area dragging |
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1775
diff
changeset
|
326 |
* @param p1 start tile of area dragging |
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1775
diff
changeset
|
327 |
* @param p2 unused |
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1775
diff
changeset
|
328 |
*/ |
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3447
diff
changeset
|
329 |
int32 CmdClearArea(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
0 | 330 |
{ |
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1775
diff
changeset
|
331 |
int32 cost, ret, money; |
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3447
diff
changeset
|
332 |
int ex; |
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3447
diff
changeset
|
333 |
int ey; |
0 | 334 |
int sx,sy; |
335 |
int x,y; |
|
336 |
bool success = false; |
|
337 |
||
2934
3b7eef9871f8
(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:
2639
diff
changeset
|
338 |
if (p1 >= MapSize()) return CMD_ERROR; |
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1775
diff
changeset
|
339 |
|
889
7f8630bfea41
(svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky.
darkvater
parents:
863
diff
changeset
|
340 |
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); |
7f8630bfea41
(svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky.
darkvater
parents:
863
diff
changeset
|
341 |
|
0 | 342 |
// make sure sx,sy are smaller than ex,ey |
3493
4d5830846ec2
(svn r4344) Use tile coordinates or even TileIndices instead of virtual tile coordinates where it suffices.
tron
parents:
3491
diff
changeset
|
343 |
ex = TileX(tile); |
4d5830846ec2
(svn r4344) Use tile coordinates or even TileIndices instead of virtual tile coordinates where it suffices.
tron
parents:
3491
diff
changeset
|
344 |
ey = TileY(tile); |
4d5830846ec2
(svn r4344) Use tile coordinates or even TileIndices instead of virtual tile coordinates where it suffices.
tron
parents:
3491
diff
changeset
|
345 |
sx = TileX(p1); |
4d5830846ec2
(svn r4344) Use tile coordinates or even TileIndices instead of virtual tile coordinates where it suffices.
tron
parents:
3491
diff
changeset
|
346 |
sy = TileY(p1); |
0 | 347 |
if (ex < sx) intswap(ex, sx); |
348 |
if (ey < sy) intswap(ey, sy); |
|
349 |
||
350 |
money = GetAvailableMoneyForCommand(); |
|
351 |
cost = 0; |
|
352 |
||
3493
4d5830846ec2
(svn r4344) Use tile coordinates or even TileIndices instead of virtual tile coordinates where it suffices.
tron
parents:
3491
diff
changeset
|
353 |
for (x = sx; x <= ex; ++x) { |
4d5830846ec2
(svn r4344) Use tile coordinates or even TileIndices instead of virtual tile coordinates where it suffices.
tron
parents:
3491
diff
changeset
|
354 |
for (y = sy; y <= ey; ++y) { |
4d5830846ec2
(svn r4344) Use tile coordinates or even TileIndices instead of virtual tile coordinates where it suffices.
tron
parents:
3491
diff
changeset
|
355 |
ret = DoCommand(TileXY(x, y), 0, 0, flags & ~DC_EXEC, CMD_LANDSCAPE_CLEAR); |
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1775
diff
changeset
|
356 |
if (CmdFailed(ret)) continue; |
0 | 357 |
cost += ret; |
358 |
success = true; |
|
359 |
||
360 |
if (flags & DC_EXEC) { |
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1775
diff
changeset
|
361 |
if (ret > 0 && (money -= ret) < 0) { |
0 | 362 |
_additional_cash_required = ret; |
363 |
return cost - ret; |
|
364 |
} |
|
3493
4d5830846ec2
(svn r4344) Use tile coordinates or even TileIndices instead of virtual tile coordinates where it suffices.
tron
parents:
3491
diff
changeset
|
365 |
DoCommand(TileXY(x, y), 0, 0, flags, CMD_LANDSCAPE_CLEAR); |
0 | 366 |
|
367 |
// draw explosion animation... |
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1775
diff
changeset
|
368 |
if ((x == sx || x == ex) && (y == sy || y == ey)) { |
0 | 369 |
// big explosion in each corner, or small explosion for single tiles |
3645
86af43f87885
(svn r4554) Replace magic numbers by TILE_{HEIGHT,SIZE}
tron
parents:
3636
diff
changeset
|
370 |
CreateEffectVehicleAbove(x * TILE_SIZE + TILE_SIZE / 2, y * TILE_SIZE + TILE_SIZE / 2, 2, |
1359
8ba976aed634
(svn r1863) Give the effect vehicle type enums more descriptive names and use the enum as parameter type for CreateEffectVehicle*()
tron
parents:
1350
diff
changeset
|
371 |
sy == ey && sx == ex ? EV_EXPLOSION_SMALL : EV_EXPLOSION_LARGE |
8ba976aed634
(svn r1863) Give the effect vehicle type enums more descriptive names and use the enum as parameter type for CreateEffectVehicle*()
tron
parents:
1350
diff
changeset
|
372 |
); |
0 | 373 |
} |
374 |
} |
|
375 |
} |
|
376 |
} |
|
377 |
||
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1775
diff
changeset
|
378 |
return (success) ? cost : CMD_ERROR; |
0 | 379 |
} |
380 |
||
381 |
||
382 |
#define TILELOOP_BITS 4 |
|
383 |
#define TILELOOP_SIZE (1 << TILELOOP_BITS) |
|
927
28f45a22a564
(svn r1415) Move TILE_FROM_XY and TILE_XY to map.h and push TILE_[XY] bits from map.h into map.c.
tron
parents:
926
diff
changeset
|
384 |
#define TILELOOP_ASSERTMASK ((TILELOOP_SIZE-1) + ((TILELOOP_SIZE-1) << MapLogX())) |
28f45a22a564
(svn r1415) Move TILE_FROM_XY and TILE_XY to map.h and push TILE_[XY] bits from map.h into map.c.
tron
parents:
926
diff
changeset
|
385 |
#define TILELOOP_CHKMASK (((1 << (MapLogX() - TILELOOP_BITS))-1) << TILELOOP_BITS) |
0 | 386 |
|
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1059
diff
changeset
|
387 |
void RunTileLoop(void) |
0 | 388 |
{ |
1589
58d173b56509
(svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents:
1384
diff
changeset
|
389 |
TileIndex tile; |
0 | 390 |
uint count; |
391 |
||
392 |
tile = _cur_tileloop_tile; |
|
393 |
||
394 |
assert( (tile & ~TILELOOP_ASSERTMASK) == 0); |
|
863
8d09f9331a80
(svn r1344) Use MapSize[XY]() (or MapSize()/MapMax[XY]() where appropriate) instead of TILES_[XY]
tron
parents:
857
diff
changeset
|
395 |
count = (MapSizeX() / TILELOOP_SIZE) * (MapSizeY() / TILELOOP_SIZE); |
0 | 396 |
do { |
1214
33e07bbb7779
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1211
diff
changeset
|
397 |
_tile_type_procs[GetTileType(tile)]->tile_loop_proc(tile); |
0 | 398 |
|
926
bd4312619522
(svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY]
tron
parents:
925
diff
changeset
|
399 |
if (TileX(tile) < MapSizeX() - TILELOOP_SIZE) { |
0 | 400 |
tile += TILELOOP_SIZE; /* no overflow */ |
401 |
} else { |
|
1981 | 402 |
tile = TILE_MASK(tile - TILELOOP_SIZE * (MapSizeX() / TILELOOP_SIZE - 1) + TileDiffXY(0, TILELOOP_SIZE)); /* x would overflow, also increase y */ |
0 | 403 |
} |
404 |
} while (--count); |
|
405 |
assert( (tile & ~TILELOOP_ASSERTMASK) == 0); |
|
406 |
||
407 |
tile += 9; |
|
408 |
if (tile & TILELOOP_CHKMASK) |
|
863
8d09f9331a80
(svn r1344) Use MapSize[XY]() (or MapSize()/MapMax[XY]() where appropriate) instead of TILES_[XY]
tron
parents:
857
diff
changeset
|
409 |
tile = (tile + MapSizeX()) & TILELOOP_ASSERTMASK; |
0 | 410 |
_cur_tileloop_tile = tile; |
411 |
} |
|
412 |
||
2055
9361b56db8ba
(svn r2564) Fix: Fixed conceptual issue in network_gui.c. AllocateName is not meant to be used by GUI-code, because it modifies the "game-state".
ludde
parents:
2051
diff
changeset
|
413 |
void InitializeLandscape(void) |
0 | 414 |
{ |
3078
ae74442bd058
(svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents:
3076
diff
changeset
|
415 |
uint maxx = MapMaxX(); |
ae74442bd058
(svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents:
3076
diff
changeset
|
416 |
uint maxy = MapMaxY(); |
ae74442bd058
(svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents:
3076
diff
changeset
|
417 |
uint sizex = MapSizeX(); |
ae74442bd058
(svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents:
3076
diff
changeset
|
418 |
uint x; |
ae74442bd058
(svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents:
3076
diff
changeset
|
419 |
uint y; |
1218 | 420 |
|
3078
ae74442bd058
(svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents:
3076
diff
changeset
|
421 |
for (y = 0; y < maxy; y++) { |
ae74442bd058
(svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents:
3076
diff
changeset
|
422 |
for (x = 0; x < maxx; x++) { |
3447 | 423 |
MakeClear(sizex * y + x, CLEAR_GRASS, 3); |
3078
ae74442bd058
(svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents:
3076
diff
changeset
|
424 |
SetTileHeight(sizex * y + x, 0); |
5573
afa6f92a71fd
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
4990
diff
changeset
|
425 |
_m[sizex * y + x].extra = 0; |
afa6f92a71fd
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
4990
diff
changeset
|
426 |
ClearBridgeMiddle(sizex * y + x); |
3078
ae74442bd058
(svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents:
3076
diff
changeset
|
427 |
} |
ae74442bd058
(svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents:
3076
diff
changeset
|
428 |
MakeVoid(sizex * y + x); |
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
1999
diff
changeset
|
429 |
} |
3078
ae74442bd058
(svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents:
3076
diff
changeset
|
430 |
for (x = 0; x < sizex; x++) MakeVoid(sizex * y + x); |
0 | 431 |
} |
432 |
||
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1059
diff
changeset
|
433 |
void ConvertGroundTilesIntoWaterTiles(void) |
0 | 434 |
{ |
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3977
diff
changeset
|
435 |
TileIndex tile; |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
436 |
uint z; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
437 |
Slope slope; |
0 | 438 |
|
1275
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
439 |
for (tile = 0; tile < MapSize(); ++tile) { |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
440 |
slope = GetTileSlope(tile, &z); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
441 |
if (IsTileType(tile, MP_CLEAR) && z == 0) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
442 |
/* Make both water for tiles at level 0 |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
443 |
* and make shore, as that looks much better |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
444 |
* during the generation. */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
445 |
switch (slope) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
446 |
case SLOPE_FLAT: |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
447 |
MakeWater(tile); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
448 |
break; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
449 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
450 |
case SLOPE_N: |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
451 |
case SLOPE_E: |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
452 |
case SLOPE_S: |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
453 |
case SLOPE_W: |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
454 |
case SLOPE_NW: |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
455 |
case SLOPE_SW: |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
456 |
case SLOPE_SE: |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
457 |
case SLOPE_NE: |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
458 |
MakeShore(tile); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
459 |
break; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
460 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
461 |
default: |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
462 |
break; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
463 |
} |
0 | 464 |
} |
465 |
} |
|
466 |
} |
|
467 |
||
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4300
diff
changeset
|
468 |
static const byte _genterrain_tbl_1[5] = { 10, 22, 33, 37, 4 }; |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4300
diff
changeset
|
469 |
static const byte _genterrain_tbl_2[5] = { 0, 0, 0, 0, 33 }; |
0 | 470 |
|
471 |
static void GenerateTerrain(int type, int flag) |
|
472 |
{ |
|
473 |
uint32 r; |
|
1275
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
474 |
uint x; |
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
475 |
uint y; |
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
476 |
uint w; |
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
477 |
uint h; |
1384
06ef4fb5bb1a
(svn r1888) The landscape template sprites are ordinary sprites, treating them as non-sprites resulted in yet another endianess issue. This fixes the problem introduced in r1855
tron
parents:
1363
diff
changeset
|
478 |
const Sprite* template; |
1275
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
479 |
const byte *p; |
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
1999
diff
changeset
|
480 |
Tile* tile; |
0 | 481 |
byte direction; |
482 |
||
483 |
r = Random(); |
|
1384
06ef4fb5bb1a
(svn r1888) The landscape template sprites are ordinary sprites, treating them as non-sprites resulted in yet another endianess issue. This fixes the problem introduced in r1855
tron
parents:
1363
diff
changeset
|
484 |
template = GetSprite((((r >> 24) * _genterrain_tbl_1[type]) >> 8) + _genterrain_tbl_2[type] + 4845); |
0 | 485 |
|
856
07dc27d0503e
(svn r1337) Use MapMax[XY]() (or MapSize[XY]() if appropriate) instead of TILE_MAX_[XY]
tron
parents:
851
diff
changeset
|
486 |
x = r & MapMaxX(); |
927
28f45a22a564
(svn r1415) Move TILE_FROM_XY and TILE_XY to map.h and push TILE_[XY] bits from map.h into map.c.
tron
parents:
926
diff
changeset
|
487 |
y = (r >> MapLogX()) & MapMaxY(); |
0 | 488 |
|
489 |
||
2951 | 490 |
if (x < 2 || y < 2) return; |
0 | 491 |
|
2140
d708eb80ab8b
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
tron
parents:
2055
diff
changeset
|
492 |
direction = GB(r, 22, 2); |
1275
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
493 |
if (direction & 1) { |
1384
06ef4fb5bb1a
(svn r1888) The landscape template sprites are ordinary sprites, treating them as non-sprites resulted in yet another endianess issue. This fixes the problem introduced in r1855
tron
parents:
1363
diff
changeset
|
494 |
w = template->height; |
06ef4fb5bb1a
(svn r1888) The landscape template sprites are ordinary sprites, treating them as non-sprites resulted in yet another endianess issue. This fixes the problem introduced in r1855
tron
parents:
1363
diff
changeset
|
495 |
h = template->width; |
1275
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
496 |
} else { |
1384
06ef4fb5bb1a
(svn r1888) The landscape template sprites are ordinary sprites, treating them as non-sprites resulted in yet another endianess issue. This fixes the problem introduced in r1855
tron
parents:
1363
diff
changeset
|
497 |
w = template->width; |
06ef4fb5bb1a
(svn r1888) The landscape template sprites are ordinary sprites, treating them as non-sprites resulted in yet another endianess issue. This fixes the problem introduced in r1855
tron
parents:
1363
diff
changeset
|
498 |
h = template->height; |
1275
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
499 |
} |
1384
06ef4fb5bb1a
(svn r1888) The landscape template sprites are ordinary sprites, treating them as non-sprites resulted in yet another endianess issue. This fixes the problem introduced in r1855
tron
parents:
1363
diff
changeset
|
500 |
p = template->data; |
0 | 501 |
|
502 |
if (flag & 4) { |
|
1273
240fa6848fbc
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
503 |
uint xw = x * MapSizeY(); |
240fa6848fbc
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
504 |
uint yw = y * MapSizeX(); |
240fa6848fbc
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
505 |
uint bias = (MapSizeX() + MapSizeY()) * 16; |
240fa6848fbc
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
506 |
|
240fa6848fbc
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
507 |
switch (flag & 3) { |
240fa6848fbc
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
508 |
case 0: |
240fa6848fbc
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
509 |
if (xw + yw > MapSize() - bias) return; |
240fa6848fbc
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
510 |
break; |
240fa6848fbc
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
511 |
|
240fa6848fbc
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
512 |
case 1: |
240fa6848fbc
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
513 |
if (yw < xw + bias) return; |
240fa6848fbc
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
514 |
break; |
240fa6848fbc
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
515 |
|
240fa6848fbc
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
516 |
case 2: |
240fa6848fbc
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
517 |
if (xw + yw < MapSize() + bias) return; |
240fa6848fbc
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
518 |
break; |
240fa6848fbc
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
519 |
|
240fa6848fbc
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
520 |
case 3: |
240fa6848fbc
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
521 |
if (xw < yw + bias) return; |
240fa6848fbc
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
522 |
break; |
0 | 523 |
} |
524 |
} |
|
525 |
||
2951 | 526 |
if (x + w >= MapMaxX() - 1) return; |
527 |
if (y + h >= MapMaxY() - 1) return; |
|
0 | 528 |
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
1999
diff
changeset
|
529 |
tile = &_m[TileXY(x, y)]; |
0 | 530 |
|
1275
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
531 |
switch (direction) { |
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
532 |
case 0: |
0 | 533 |
do { |
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
1999
diff
changeset
|
534 |
Tile* tile_cur = tile; |
1275
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
535 |
uint w_cur; |
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
536 |
|
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
537 |
for (w_cur = w; w_cur != 0; --w_cur) { |
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
1999
diff
changeset
|
538 |
if (*p >= tile_cur->type_height) tile_cur->type_height = *p; |
1275
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
539 |
p++; |
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
540 |
tile_cur++; |
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
541 |
} |
1981 | 542 |
tile += TileDiffXY(0, 1); |
1275
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
543 |
} while (--h != 0); |
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
544 |
break; |
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
545 |
|
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
546 |
case 1: |
0 | 547 |
do { |
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
1999
diff
changeset
|
548 |
Tile* tile_cur = tile; |
1275
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
549 |
uint h_cur; |
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
550 |
|
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
551 |
for (h_cur = h; h_cur != 0; --h_cur) { |
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
1999
diff
changeset
|
552 |
if (*p >= tile_cur->type_height) tile_cur->type_height = *p; |
1275
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
553 |
p++; |
1981 | 554 |
tile_cur += TileDiffXY(0, 1); |
1275
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
555 |
} |
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
556 |
tile++; |
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
557 |
} while (--w != 0); |
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
558 |
break; |
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
559 |
|
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
560 |
case 2: |
1981 | 561 |
tile += TileDiffXY(w - 1, 0); |
0 | 562 |
do { |
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
1999
diff
changeset
|
563 |
Tile* tile_cur = tile; |
1275
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
564 |
uint w_cur; |
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
565 |
|
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
566 |
for (w_cur = w; w_cur != 0; --w_cur) { |
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
1999
diff
changeset
|
567 |
if (*p >= tile_cur->type_height) tile_cur->type_height = *p; |
1275
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
568 |
p++; |
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
569 |
tile_cur--; |
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
570 |
} |
1981 | 571 |
tile += TileDiffXY(0, 1); |
1275
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
572 |
} while (--h != 0); |
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
573 |
break; |
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
574 |
|
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
575 |
case 3: |
1981 | 576 |
tile += TileDiffXY(0, h - 1); |
1275
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
577 |
do { |
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
1999
diff
changeset
|
578 |
Tile* tile_cur = tile; |
1275
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
579 |
uint h_cur; |
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
580 |
|
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
581 |
for (h_cur = h; h_cur != 0; --h_cur) { |
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
1999
diff
changeset
|
582 |
if (*p >= tile_cur->type_height) tile_cur->type_height = *p; |
1275
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
583 |
p++; |
1981 | 584 |
tile_cur -= TileDiffXY(0, 1); |
1278
1fbb6cf8d3f1
(svn r1782) Remove line which should've been removed in r1779 and caused map generation to hang infinitely
tron
parents:
1275
diff
changeset
|
585 |
} |
1275
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
586 |
tile++; |
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
587 |
} while (--w != 0); |
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
588 |
break; |
0 | 589 |
} |
590 |
} |
|
591 |
||
592 |
||
593 |
#include "table/genland.h" |
|
594 |
||
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1059
diff
changeset
|
595 |
static void CreateDesertOrRainForest(void) |
0 | 596 |
{ |
1275
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
597 |
TileIndex tile; |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
598 |
TileIndex update_freq = MapSize() / 4; |
909
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
599 |
const TileIndexDiffC *data; |
1275
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
600 |
uint i; |
0 | 601 |
|
909
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
602 |
for (tile = 0; tile != MapSize(); ++tile) { |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
603 |
if ((tile % update_freq) == 0) IncreaseGeneratingWorldProgress(GWP_LANDSCAPE); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
604 |
|
909
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
605 |
for (data = _make_desert_or_rainforest_data; |
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
606 |
data != endof(_make_desert_or_rainforest_data); ++data) { |
1184
7f0ac9482dad
(svn r1686) Fix (Work around?) crash when generating tropical maps
tron
parents:
1181
diff
changeset
|
607 |
TileIndex t = TILE_MASK(tile + ToTileIndexDiff(*data)); |
1044
9b73df700a7c
(svn r1545) Add TileHeight() which returns the height (not multiplied by 8)
tron
parents:
1035
diff
changeset
|
608 |
if (TileHeight(t) >= 4 || IsTileType(t, MP_WATER)) break; |
909
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
609 |
} |
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
610 |
if (data == endof(_make_desert_or_rainforest_data)) |
3379
ea8aa9e71328
(svn r4181) CodeChange : Replaced [G/S]etMapExtraBits by [G/S]etTropicZone. Although it was an accessor, nor his usage nor the values were clear.
belugas
parents:
3297
diff
changeset
|
611 |
SetTropicZone(tile, TROPICZONE_DESERT); |
909
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
612 |
} |
183
ec2b02ea4c88
(svn r184) -Fix: starting a new game in DesertLandscape crashed the game
truelight
parents:
159
diff
changeset
|
613 |
|
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
614 |
for (i = 0; i != 256; i++) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
615 |
if ((i % 64) == 0) IncreaseGeneratingWorldProgress(GWP_LANDSCAPE); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
616 |
|
0 | 617 |
RunTileLoop(); |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
618 |
} |
0 | 619 |
|
909
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
620 |
for (tile = 0; tile != MapSize(); ++tile) { |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
621 |
if ((tile % update_freq) == 0) IncreaseGeneratingWorldProgress(GWP_LANDSCAPE); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
622 |
|
909
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
623 |
for (data = _make_desert_or_rainforest_data; |
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
624 |
data != endof(_make_desert_or_rainforest_data); ++data) { |
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
625 |
TileIndex t = TILE_MASK(tile + ToTileIndexDiff(*data)); |
3447 | 626 |
if (IsTileType(t, MP_CLEAR) && IsClearGround(t, CLEAR_DESERT)) break; |
909
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
627 |
} |
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
628 |
if (data == endof(_make_desert_or_rainforest_data)) |
3379
ea8aa9e71328
(svn r4181) CodeChange : Replaced [G/S]etMapExtraBits by [G/S]etTropicZone. Although it was an accessor, nor his usage nor the values were clear.
belugas
parents:
3297
diff
changeset
|
629 |
SetTropicZone(tile, TROPICZONE_RAINFOREST); |
909
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
630 |
} |
0 | 631 |
} |
632 |
||
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
633 |
void GenerateLandscape(byte mode) |
0 | 634 |
{ |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
635 |
const int gwp_desert_amount = 4 + 8; |
1275
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
636 |
uint i; |
10f4edfafb5a
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
637 |
uint flag; |
0 | 638 |
uint32 r; |
183
ec2b02ea4c88
(svn r184) -Fix: starting a new game in DesertLandscape crashed the game
truelight
parents:
159
diff
changeset
|
639 |
|
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
640 |
if (mode == GW_HEIGHTMAP) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
641 |
SetGeneratingWorldProgress(GWP_LANDSCAPE, (_opt.landscape == LT_DESERT) ? 1 + gwp_desert_amount : 1); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
642 |
LoadHeightmap(_file_to_saveload.name); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
643 |
IncreaseGeneratingWorldProgress(GWP_LANDSCAPE); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
644 |
} else if (_patches.land_generator == LG_TERRAGENESIS) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
645 |
SetGeneratingWorldProgress(GWP_LANDSCAPE, (_opt.landscape == LT_DESERT) ? 3 + gwp_desert_amount : 3); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
646 |
GenerateTerrainPerlin(); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
647 |
} else { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
648 |
switch (_opt.landscape) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
649 |
case LT_HILLY: |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
650 |
SetGeneratingWorldProgress(GWP_LANDSCAPE, 2); |
0 | 651 |
|
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
652 |
for (i = ScaleByMapSize((Random() & 0x7F) + 950); i != 0; --i) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
653 |
GenerateTerrain(2, 0); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
654 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
655 |
IncreaseGeneratingWorldProgress(GWP_LANDSCAPE); |
3017
915fae59d5e0
(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:
2955
diff
changeset
|
656 |
|
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
657 |
r = Random(); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
658 |
flag = GB(r, 0, 2) | 4; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
659 |
for (i = ScaleByMapSize(GB(r, 16, 7) + 450); i != 0; --i) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
660 |
GenerateTerrain(4, flag); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
661 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
662 |
IncreaseGeneratingWorldProgress(GWP_LANDSCAPE); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
663 |
break; |
3017
915fae59d5e0
(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:
2955
diff
changeset
|
664 |
|
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
665 |
case LT_DESERT: |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
666 |
SetGeneratingWorldProgress(GWP_LANDSCAPE, 3 + gwp_desert_amount); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
667 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
668 |
for (i = ScaleByMapSize((Random() & 0x7F) + 170); i != 0; --i) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
669 |
GenerateTerrain(0, 0); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
670 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
671 |
IncreaseGeneratingWorldProgress(GWP_LANDSCAPE); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
672 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
673 |
r = Random(); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
674 |
flag = GB(r, 0, 2) | 4; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
675 |
for (i = ScaleByMapSize(GB(r, 16, 8) + 1700); i != 0; --i) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
676 |
GenerateTerrain(0, flag); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
677 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
678 |
IncreaseGeneratingWorldProgress(GWP_LANDSCAPE); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
679 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
680 |
flag ^= 2; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
681 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
682 |
for (i = ScaleByMapSize((Random() & 0x7F) + 410); i != 0; --i) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
683 |
GenerateTerrain(3, flag); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
684 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
685 |
IncreaseGeneratingWorldProgress(GWP_LANDSCAPE); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
686 |
break; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
687 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
688 |
default: |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
689 |
SetGeneratingWorldProgress(GWP_LANDSCAPE, 1); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
690 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
691 |
i = ScaleByMapSize((Random() & 0x7F) + (3 - _opt.diff.quantity_sea_lakes) * 256 + 100); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
692 |
for (; i != 0; --i) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
693 |
GenerateTerrain(_opt.diff.terrain_type, 0); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
694 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
695 |
IncreaseGeneratingWorldProgress(GWP_LANDSCAPE); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
696 |
break; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4253
diff
changeset
|
697 |
} |
0 | 698 |
} |
699 |
||
700 |
ConvertGroundTilesIntoWaterTiles(); |
|
701 |
||
3017
915fae59d5e0
(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:
2955
diff
changeset
|
702 |
if (_opt.landscape == LT_DESERT) CreateDesertOrRainForest(); |
0 | 703 |
} |
704 |
||
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1059
diff
changeset
|
705 |
void OnTick_Town(void); |
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1059
diff
changeset
|
706 |
void OnTick_Trees(void); |
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1059
diff
changeset
|
707 |
void OnTick_Station(void); |
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1059
diff
changeset
|
708 |
void OnTick_Industry(void); |
0 | 709 |
|
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1059
diff
changeset
|
710 |
void OnTick_Players(void); |
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1059
diff
changeset
|
711 |
void OnTick_Train(void); |
0 | 712 |
|
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1059
diff
changeset
|
713 |
void CallLandscapeTick(void) |
0 | 714 |
{ |
715 |
OnTick_Town(); |
|
716 |
OnTick_Trees(); |
|
717 |
OnTick_Station(); |
|
718 |
OnTick_Industry(); |
|
719 |
||
720 |
OnTick_Players(); |
|
721 |
OnTick_Train(); |
|
722 |
} |
|
723 |
||
724 |
TileIndex AdjustTileCoordRandomly(TileIndex a, byte rng) |
|
725 |
{ |
|
726 |
int rn = rng; |
|
727 |
uint32 r = Random(); |
|
728 |
||
1981 | 729 |
return TILE_MASK(TileXY( |
2150
010d923a81a9
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2140
diff
changeset
|
730 |
TileX(a) + (GB(r, 0, 8) * rn * 2 >> 8) - rn, |
010d923a81a9
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2140
diff
changeset
|
731 |
TileY(a) + (GB(r, 8, 8) * rn * 2 >> 8) - rn |
1174
27e386195965
(svn r1676) Increase the size of TileIndex and TileIndexDiff to 32bits and adapt the save/load data and some other parts of the code to that change
tron
parents:
1140
diff
changeset
|
732 |
)); |
0 | 733 |
} |
734 |
||
1589
58d173b56509
(svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents:
1384
diff
changeset
|
735 |
bool IsValidTile(TileIndex tile) |
0 | 736 |
{ |
926
bd4312619522
(svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY]
tron
parents:
925
diff
changeset
|
737 |
return (tile < MapSizeX() * MapMaxY() && TileX(tile) != MapMaxX()); |
0 | 738 |
} |