author | tron |
Sun, 05 Mar 2006 10:19:33 +0000 | |
changeset 3144 | 33e42feae531 |
parent 3111 | 750f37699a13 |
child 3297 | b2b8cf7364c9 |
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:
1793
diff
changeset
|
4 |
#include "openttd.h" |
3144
33e42feae531
(svn r3763) Adapt to the new 'map accessors go in foo_map.h'-scheme
tron
parents:
3111
diff
changeset
|
5 |
#include "clear_map.h" |
2163
b17b313113a0
(svn r2673) Include functions.h directly, not globally via openttd.h
tron
parents:
2159
diff
changeset
|
6 |
#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:
473
diff
changeset
|
7 |
#include "map.h" |
2154
f86c59e73a16
(svn r2664) Remove depedency on player.h from variables.h
tron
parents:
2150
diff
changeset
|
8 |
#include "player.h" |
1349
15979a2e9001
(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
|
9 |
#include "spritecache.h" |
1363
775a7ee52369
(svn r1867) Include tables/sprites.h only in files which need it
tron
parents:
1359
diff
changeset
|
10 |
#include "table/sprites.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:
1202
diff
changeset
|
11 |
#include "tile.h" |
0 | 12 |
#include <stdarg.h> |
13 |
#include "viewport.h" |
|
14 |
#include "command.h" |
|
15 |
#include "vehicle.h" |
|
2159
f6284cf5fab0
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2154
diff
changeset
|
16 |
#include "variables.h" |
3144
33e42feae531
(svn r3763) Adapt to the new 'map accessors go in foo_map.h'-scheme
tron
parents:
3111
diff
changeset
|
17 |
#include "void_map.h" |
3111
750f37699a13
(svn r3714) Add functions to turn tiles into water and shore tiles
tron
parents:
3078
diff
changeset
|
18 |
#include "water_map.h" |
0 | 19 |
|
183
ec2b02ea4c88
(svn r184) -Fix: starting a new game in DesertLandscape crashed the game
truelight
parents:
159
diff
changeset
|
20 |
extern const TileTypeProcs |
0 | 21 |
_tile_type_clear_procs, |
22 |
_tile_type_rail_procs, |
|
23 |
_tile_type_road_procs, |
|
24 |
_tile_type_town_procs, |
|
25 |
_tile_type_trees_procs, |
|
26 |
_tile_type_station_procs, |
|
27 |
_tile_type_water_procs, |
|
28 |
_tile_type_dummy_procs, |
|
29 |
_tile_type_industry_procs, |
|
30 |
_tile_type_tunnelbridge_procs, |
|
31 |
_tile_type_unmovable_procs; |
|
32 |
||
33 |
const TileTypeProcs * const _tile_type_procs[16] = { |
|
34 |
&_tile_type_clear_procs, |
|
35 |
&_tile_type_rail_procs, |
|
36 |
&_tile_type_road_procs, |
|
37 |
&_tile_type_town_procs, |
|
38 |
&_tile_type_trees_procs, |
|
39 |
&_tile_type_station_procs, |
|
40 |
&_tile_type_water_procs, |
|
41 |
&_tile_type_dummy_procs, |
|
42 |
&_tile_type_industry_procs, |
|
43 |
&_tile_type_tunnelbridge_procs, |
|
44 |
&_tile_type_unmovable_procs, |
|
45 |
}; |
|
46 |
||
47 |
/* landscape slope => sprite */ |
|
48 |
const byte _tileh_to_sprite[32] = { |
|
49 |
0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,0, |
|
50 |
0,0,0,0,0,0,0,16,0,0,0,17,0,15,18,0, |
|
51 |
}; |
|
52 |
||
1958
0266bb01a1e6
(svn r2464) Move definition of _inclined_tileh out of variables.h
tron
parents:
1902
diff
changeset
|
53 |
const byte _inclined_tileh[] = { |
0266bb01a1e6
(svn r2464) Move definition of _inclined_tileh out of variables.h
tron
parents:
1902
diff
changeset
|
54 |
3, 9, 3, 6, 12, 6, 12, 9 |
0266bb01a1e6
(svn r2464) Move definition of _inclined_tileh out of variables.h
tron
parents:
1902
diff
changeset
|
55 |
}; |
0266bb01a1e6
(svn r2464) Move definition of _inclined_tileh out of variables.h
tron
parents:
1902
diff
changeset
|
56 |
|
0 | 57 |
|
1193
edf70d2a5ea6
(svn r1697) Remove superflous special case for the VOID border tiles in FindLandscapeHeightByTile()
tron
parents:
1184
diff
changeset
|
58 |
void FindLandscapeHeightByTile(TileInfo *ti, TileIndex tile) |
0 | 59 |
{ |
1193
edf70d2a5ea6
(svn r1697) Remove superflous special case for the VOID border tiles in FindLandscapeHeightByTile()
tron
parents:
1184
diff
changeset
|
60 |
assert(tile < MapSize()); |
0 | 61 |
|
62 |
ti->tile = 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:
1999
diff
changeset
|
63 |
ti->map5 = _m[tile].m5; |
1214
8262981ac274
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1211
diff
changeset
|
64 |
ti->type = GetTileType(tile); |
0 | 65 |
ti->tileh = GetTileSlope(tile, &ti->z); |
66 |
} |
|
67 |
||
68 |
/* find the landscape height for the coordinates x y */ |
|
69 |
void FindLandscapeHeight(TileInfo *ti, uint x, uint y) |
|
70 |
{ |
|
71 |
ti->x = x; |
|
72 |
ti->y = y; |
|
73 |
||
856
918759cedca8
(svn r1337) Use MapMax[XY]() (or MapSize[XY]() if appropriate) instead of TILE_MAX_[XY]
tron
parents:
851
diff
changeset
|
74 |
if (x >= MapMaxX() * 16 - 1 || y >= MapMaxY() * 16 - 1) { |
0 | 75 |
ti->tileh = 0; |
925
47d7952c6c14
(svn r1413) Fixed a serious memory leak problem. The invisible tiles on the southern border now have the correct tile type (MP_VOID) again. Please note that older maps might still have incorrect border tiles, thus still causing overflows.
dominik
parents:
909
diff
changeset
|
76 |
ti->type = MP_VOID; |
0 | 77 |
ti->tile = 0; |
78 |
ti->map5 = 0; |
|
79 |
ti->z = 0; |
|
80 |
return; |
|
81 |
} |
|
82 |
||
1980
6c5917cfcb78
(svn r2486) Turn TILE_FROM_XY into an inline function and rename it to TileVirtXY
tron
parents:
1958
diff
changeset
|
83 |
FindLandscapeHeightByTile(ti, TileVirtXY(x, y)); |
0 | 84 |
} |
85 |
||
86 |
uint GetPartialZ(int x, int y, int corners) |
|
87 |
{ |
|
88 |
int z = 0; |
|
89 |
||
2952 | 90 |
switch (corners) { |
0 | 91 |
case 1: |
92 |
if (x - y >= 0) |
|
93 |
z = (x - y) >> 1; |
|
94 |
break; |
|
183
ec2b02ea4c88
(svn r184) -Fix: starting a new game in DesertLandscape crashed the game
truelight
parents:
159
diff
changeset
|
95 |
|
0 | 96 |
case 2: |
97 |
y^=0xF; |
|
98 |
if ( (x - y) >= 0) |
|
99 |
z = (x - y) >> 1; |
|
100 |
break; |
|
101 |
||
102 |
case 3: |
|
103 |
z = (x>>1) + 1; |
|
104 |
break; |
|
105 |
||
106 |
case 4: |
|
107 |
if (y - x >= 0) |
|
108 |
z = (y - x) >> 1; |
|
109 |
break; |
|
110 |
||
111 |
case 5: |
|
112 |
case 10: |
|
113 |
case 15: |
|
114 |
z = 4; |
|
115 |
break; |
|
116 |
||
117 |
case 6: |
|
118 |
z = (y>>1) + 1; |
|
119 |
break; |
|
120 |
||
121 |
case 7: |
|
122 |
z = 8; |
|
123 |
y^=0xF; |
|
124 |
if (x - y < 0) |
|
125 |
z += (x - y) >> 1; |
|
126 |
break; |
|
127 |
||
128 |
case 8: |
|
129 |
y ^= 0xF; |
|
130 |
if (y - x >= 0) |
|
131 |
z = (y - x) >> 1; |
|
132 |
break; |
|
133 |
||
134 |
case 9: |
|
135 |
z = (y^0xF)>>1; |
|
136 |
break; |
|
137 |
||
138 |
case 11: |
|
139 |
z = 8; |
|
140 |
if (x - y < 0) |
|
141 |
z += (x - y) >> 1; |
|
142 |
break; |
|
143 |
||
144 |
case 12: |
|
145 |
z = (x^0xF)>>1; |
|
146 |
break; |
|
147 |
||
148 |
case 13: |
|
149 |
z = 8; |
|
150 |
y ^= 0xF; |
|
151 |
if (y - x < 0) |
|
152 |
z += (y - x) >> 1; |
|
153 |
break; |
|
154 |
||
155 |
case 14: |
|
156 |
z = 8; |
|
157 |
if (y - x < 0) |
|
158 |
z += (y - x) >> 1; |
|
159 |
break; |
|
160 |
||
161 |
case 23: |
|
162 |
z = 1 + ((x+y)>>1); |
|
163 |
break; |
|
164 |
||
165 |
case 27: |
|
166 |
z = 1 + ((x+(y^0xF))>>1); |
|
167 |
break; |
|
168 |
||
169 |
case 29: |
|
170 |
z = 1 + (((x^0xF)+(y^0xF))>>1); |
|
171 |
break; |
|
183
ec2b02ea4c88
(svn r184) -Fix: starting a new game in DesertLandscape crashed the game
truelight
parents:
159
diff
changeset
|
172 |
|
0 | 173 |
case 30: |
174 |
z = 1 + (((x^0xF)+(y^0xF))>>1); |
|
175 |
break; |
|
176 |
} |
|
177 |
||
178 |
return z; |
|
179 |
} |
|
180 |
||
2951 | 181 |
uint GetSlopeZ(int x, int y) |
0 | 182 |
{ |
183 |
TileInfo ti; |
|
184 |
||
185 |
FindLandscapeHeight(&ti, x, y); |
|
186 |
||
187 |
return _tile_type_procs[ti.type]->get_slope_z_proc(&ti); |
|
188 |
} |
|
189 |
||
39 | 190 |
// direction=true: check for foundation in east and south corner |
191 |
// direction=false: check for foundation in west and south corner |
|
2548
49c8a096033f
(svn r3077) static, const, bracing, indentation, 0 -> '\0'/NULL, typos in comments, excess empty lines, minor other changes
tron
parents:
2535
diff
changeset
|
192 |
static bool hasFoundation(const TileInfo* ti, bool direction) |
37
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
193 |
{ |
39 | 194 |
bool south, other; // southern corner and east/west corner |
195 |
uint slope = _tile_type_procs[ti->type]->get_slope_tileh_proc(ti); |
|
50 | 196 |
uint tileh = ti->tileh; |
197 |
||
2548
49c8a096033f
(svn r3077) static, const, bracing, indentation, 0 -> '\0'/NULL, typos in comments, excess empty lines, minor other changes
tron
parents:
2535
diff
changeset
|
198 |
if (slope == 0 && slope != tileh) tileh = 15; |
50 | 199 |
south = (tileh & 2) != (slope & 2); |
39 | 200 |
|
2548
49c8a096033f
(svn r3077) static, const, bracing, indentation, 0 -> '\0'/NULL, typos in comments, excess empty lines, minor other changes
tron
parents:
2535
diff
changeset
|
201 |
if (direction) { |
50 | 202 |
other = (tileh & 4) != (slope & 4); |
2548
49c8a096033f
(svn r3077) static, const, bracing, indentation, 0 -> '\0'/NULL, typos in comments, excess empty lines, minor other changes
tron
parents:
2535
diff
changeset
|
203 |
} else { |
50 | 204 |
other = (tileh & 1) != (slope & 1); |
2548
49c8a096033f
(svn r3077) static, const, bracing, indentation, 0 -> '\0'/NULL, typos in comments, excess empty lines, minor other changes
tron
parents:
2535
diff
changeset
|
205 |
} |
50 | 206 |
return south || other; |
37
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
207 |
} |
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
208 |
|
0 | 209 |
void DrawFoundation(TileInfo *ti, uint f) |
210 |
{ |
|
37
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
211 |
uint32 sprite_base = SPR_SLOPES_BASE-14; |
39 | 212 |
|
213 |
TileInfo ti2; |
|
2639 | 214 |
FindLandscapeHeight(&ti2, ti->x, ti->y - 1); |
215 |
if (hasFoundation(&ti2, true)) sprite_base += 22; // foundation in NW direction |
|
216 |
FindLandscapeHeight(&ti2, ti->x - 1, ti->y); |
|
217 |
if (hasFoundation(&ti2, false)) sprite_base += 22 * 2; // foundation in NE direction |
|
37
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
218 |
|
0 | 219 |
if (f < 15) { |
183
ec2b02ea4c88
(svn r184) -Fix: starting a new game in DesertLandscape crashed the game
truelight
parents:
159
diff
changeset
|
220 |
// leveled foundation |
2535 | 221 |
if (sprite_base < SPR_SLOPES_BASE) sprite_base = SPR_FOUNDATION_BASE + 1; // use original slope sprites |
37
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
222 |
|
2639 | 223 |
AddSortableSpriteToDraw(f - 1 + sprite_base, ti->x, ti->y, 16, 16, 7, ti->z); |
0 | 224 |
ti->z += 8; |
225 |
ti->tileh = 0; |
|
226 |
OffsetGroundSprite(31, 1); |
|
227 |
} else { |
|
228 |
// inclined foundation |
|
37
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
229 |
sprite_base += 14; |
183
ec2b02ea4c88
(svn r184) -Fix: starting a new game in DesertLandscape crashed the game
truelight
parents:
159
diff
changeset
|
230 |
|
0 | 231 |
AddSortableSpriteToDraw( |
2535 | 232 |
HASBIT((1<<1) | (1<<2) | (1<<4) | (1<<8), ti->tileh) ? sprite_base + (f - 15) : SPR_FOUNDATION_BASE + ti->tileh, |
0 | 233 |
ti->x, ti->y, 1, 1, 1, ti->z |
234 |
); |
|
183
ec2b02ea4c88
(svn r184) -Fix: starting a new game in DesertLandscape crashed the game
truelight
parents:
159
diff
changeset
|
235 |
|
0 | 236 |
ti->tileh = _inclined_tileh[f - 15]; |
237 |
OffsetGroundSprite(31, 9); |
|
238 |
} |
|
239 |
} |
|
240 |
||
1589
bac29165710f
(svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents:
1384
diff
changeset
|
241 |
void DoClearSquare(TileIndex tile) |
0 | 242 |
{ |
3076
8b54ff8fa90a
(svn r3665) Add a function to turn a tile into a clear tile
tron
parents:
3075
diff
changeset
|
243 |
MakeClear(tile, CL_GRASS, _generating_world ? 3 : 0); |
2955
24de69e236d2
(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
|
244 |
MarkTileDirtyByTile(tile); |
0 | 245 |
} |
246 |
||
1589
bac29165710f
(svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents:
1384
diff
changeset
|
247 |
uint32 GetTileTrackStatus(TileIndex tile, TransportType mode) |
0 | 248 |
{ |
1214
8262981ac274
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1211
diff
changeset
|
249 |
return _tile_type_procs[GetTileType(tile)]->get_tile_track_status_proc(tile, mode); |
0 | 250 |
} |
251 |
||
1589
bac29165710f
(svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents:
1384
diff
changeset
|
252 |
void ChangeTileOwner(TileIndex tile, byte old_player, byte new_player) |
0 | 253 |
{ |
1214
8262981ac274
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1211
diff
changeset
|
254 |
_tile_type_procs[GetTileType(tile)]->change_tile_owner_proc(tile, old_player, new_player); |
0 | 255 |
} |
256 |
||
1589
bac29165710f
(svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents:
1384
diff
changeset
|
257 |
void GetAcceptedCargo(TileIndex tile, AcceptedCargo ac) |
0 | 258 |
{ |
259 |
memset(ac, 0, sizeof(AcceptedCargo)); |
|
1214
8262981ac274
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1211
diff
changeset
|
260 |
_tile_type_procs[GetTileType(tile)]->get_accepted_cargo_proc(tile, ac); |
0 | 261 |
} |
262 |
||
1589
bac29165710f
(svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents:
1384
diff
changeset
|
263 |
void AnimateTile(TileIndex tile) |
0 | 264 |
{ |
1214
8262981ac274
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1211
diff
changeset
|
265 |
_tile_type_procs[GetTileType(tile)]->animate_tile_proc(tile); |
0 | 266 |
} |
267 |
||
1589
bac29165710f
(svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents:
1384
diff
changeset
|
268 |
void ClickTile(TileIndex tile) |
0 | 269 |
{ |
1214
8262981ac274
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1211
diff
changeset
|
270 |
_tile_type_procs[GetTileType(tile)]->click_tile_proc(tile); |
0 | 271 |
} |
272 |
||
273 |
void DrawTile(TileInfo *ti) |
|
274 |
{ |
|
275 |
_tile_type_procs[ti->type]->draw_tile_proc(ti); |
|
276 |
} |
|
277 |
||
1589
bac29165710f
(svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents:
1384
diff
changeset
|
278 |
void GetTileDesc(TileIndex tile, TileDesc *td) |
0 | 279 |
{ |
1214
8262981ac274
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1211
diff
changeset
|
280 |
_tile_type_procs[GetTileType(tile)]->get_tile_desc_proc(tile, td); |
0 | 281 |
} |
282 |
||
1775
548dc04d50e2
(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
|
283 |
/** Clear a piece of landscape |
548dc04d50e2
(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
|
284 |
* @param x,y coordinates of clearance |
548dc04d50e2
(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
|
285 |
* @param p1 unused |
548dc04d50e2
(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
|
286 |
* @param p2 unused |
0 | 287 |
*/ |
288 |
int32 CmdLandscapeClear(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
|
289 |
{ |
|
1980
6c5917cfcb78
(svn r2486) Turn TILE_FROM_XY into an inline function and rename it to TileVirtXY
tron
parents:
1958
diff
changeset
|
290 |
TileIndex tile = TileVirtXY(x, y); |
1589
bac29165710f
(svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents:
1384
diff
changeset
|
291 |
|
0 | 292 |
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); |
293 |
||
1214
8262981ac274
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1211
diff
changeset
|
294 |
return _tile_type_procs[GetTileType(tile)]->clear_tile_proc(tile, flags); |
0 | 295 |
} |
296 |
||
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1775
diff
changeset
|
297 |
/** Clear a big piece of landscape |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1775
diff
changeset
|
298 |
* @param x,y end coordinates of area dragging |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1775
diff
changeset
|
299 |
* @param p1 start tile of area dragging |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1775
diff
changeset
|
300 |
* @param p2 unused |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1775
diff
changeset
|
301 |
*/ |
0 | 302 |
int32 CmdClearArea(int ex, int ey, uint32 flags, uint32 p1, uint32 p2) |
303 |
{ |
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1775
diff
changeset
|
304 |
int32 cost, ret, money; |
0 | 305 |
int sx,sy; |
306 |
int x,y; |
|
307 |
bool success = false; |
|
308 |
||
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:
2639
diff
changeset
|
309 |
if (p1 >= MapSize()) return CMD_ERROR; |
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1775
diff
changeset
|
310 |
|
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:
863
diff
changeset
|
311 |
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:
863
diff
changeset
|
312 |
|
0 | 313 |
// make sure sx,sy are smaller than ex,ey |
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:
925
diff
changeset
|
314 |
sx = TileX(p1) * 16; |
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:
925
diff
changeset
|
315 |
sy = TileY(p1) * 16; |
0 | 316 |
if (ex < sx) intswap(ex, sx); |
317 |
if (ey < sy) intswap(ey, sy); |
|
318 |
||
319 |
money = GetAvailableMoneyForCommand(); |
|
320 |
cost = 0; |
|
321 |
||
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1775
diff
changeset
|
322 |
for (x = sx; x <= ex; x += 16) { |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1775
diff
changeset
|
323 |
for (y = sy; y <= ey; y += 16) { |
1980
6c5917cfcb78
(svn r2486) Turn TILE_FROM_XY into an inline function and rename it to TileVirtXY
tron
parents:
1958
diff
changeset
|
324 |
ret = DoCommandByTile(TileVirtXY(x, y), 0, 0, flags & ~DC_EXEC, CMD_LANDSCAPE_CLEAR); |
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1775
diff
changeset
|
325 |
if (CmdFailed(ret)) continue; |
0 | 326 |
cost += ret; |
327 |
success = true; |
|
328 |
||
329 |
if (flags & DC_EXEC) { |
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1775
diff
changeset
|
330 |
if (ret > 0 && (money -= ret) < 0) { |
0 | 331 |
_additional_cash_required = ret; |
332 |
return cost - ret; |
|
333 |
} |
|
1980
6c5917cfcb78
(svn r2486) Turn TILE_FROM_XY into an inline function and rename it to TileVirtXY
tron
parents:
1958
diff
changeset
|
334 |
DoCommandByTile(TileVirtXY(x, y), 0, 0, flags, CMD_LANDSCAPE_CLEAR); |
0 | 335 |
|
336 |
// draw explosion animation... |
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1775
diff
changeset
|
337 |
if ((x == sx || x == ex) && (y == sy || y == ey)) { |
0 | 338 |
// big explosion in each corner, or small explosion for single tiles |
1359
52782e5cf7c9
(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
|
339 |
CreateEffectVehicleAbove(x + 8, y + 8, 2, |
52782e5cf7c9
(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
|
340 |
sy == ey && sx == ex ? EV_EXPLOSION_SMALL : EV_EXPLOSION_LARGE |
52782e5cf7c9
(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
|
341 |
); |
0 | 342 |
} |
343 |
} |
|
344 |
} |
|
345 |
} |
|
346 |
||
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1775
diff
changeset
|
347 |
return (success) ? cost : CMD_ERROR; |
0 | 348 |
} |
349 |
||
350 |
||
351 |
/* utility function used to modify a tile */ |
|
1589
bac29165710f
(svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents:
1384
diff
changeset
|
352 |
void CDECL ModifyTile(TileIndex tile, uint flags, ...) |
0 | 353 |
{ |
354 |
va_list va; |
|
355 |
int i; |
|
356 |
||
357 |
va_start(va, flags); |
|
358 |
||
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:
2055
diff
changeset
|
359 |
if ((i = GB(flags, 8, 4)) != 0) { |
1059
fe97d81a1b4f
(svn r1560) Introduce SetTileType() and SetTileHeight()
tron
parents:
1044
diff
changeset
|
360 |
SetTileType(tile, i - 1); |
0 | 361 |
} |
362 |
||
363 |
if (flags & (MP_MAP2_CLEAR | MP_MAP2)) { |
|
364 |
int x = 0; |
|
365 |
if (flags & MP_MAP2) x = va_arg(va, int); |
|
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:
1999
diff
changeset
|
366 |
_m[tile].m2 = x; |
0 | 367 |
} |
368 |
||
369 |
if (flags & (MP_MAP3LO_CLEAR | MP_MAP3LO)) { |
|
370 |
int x = 0; |
|
371 |
if (flags & MP_MAP3LO) x = va_arg(va, int); |
|
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:
1999
diff
changeset
|
372 |
_m[tile].m3 = x; |
0 | 373 |
} |
374 |
||
375 |
if (flags & (MP_MAP3HI_CLEAR | MP_MAP3HI)) { |
|
376 |
int x = 0; |
|
377 |
if (flags & MP_MAP3HI) x = va_arg(va, int); |
|
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:
1999
diff
changeset
|
378 |
_m[tile].m4 = x; |
0 | 379 |
} |
380 |
||
381 |
if (flags & (MP_MAPOWNER|MP_MAPOWNER_CURRENT)) { |
|
2498
3ed05caa4449
(svn r3024) -Codechange: Another batch of replacements of int/uint/int16/byte/-1 with proper types and constants
tron
parents:
2360
diff
changeset
|
382 |
PlayerID x = _current_player; |
0 | 383 |
if (flags & MP_MAPOWNER) x = va_arg(va, int); |
2360
4e4ebe18e448
(svn r2886) Rename the "owner" attribute to "m1", because when it stores an owner it is accessed by [GS]etOwner anyway and when it doesn't store an owner, but arbitrary data, accessing a field called "owner" is confusing.
tron
parents:
2186
diff
changeset
|
384 |
_m[tile].m1 = x; |
0 | 385 |
} |
386 |
||
387 |
if (flags & 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:
1999
diff
changeset
|
388 |
_m[tile].m5 = va_arg(va, int); |
0 | 389 |
} |
390 |
||
391 |
va_end(va); |
|
392 |
||
393 |
if (!(flags & MP_NODIRTY)) |
|
394 |
MarkTileDirtyByTile(tile); |
|
395 |
} |
|
396 |
||
397 |
||
398 |
#define TILELOOP_BITS 4 |
|
399 |
#define TILELOOP_SIZE (1 << TILELOOP_BITS) |
|
927
94fec9843fd3
(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
|
400 |
#define TILELOOP_ASSERTMASK ((TILELOOP_SIZE-1) + ((TILELOOP_SIZE-1) << MapLogX())) |
94fec9843fd3
(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
|
401 |
#define TILELOOP_CHKMASK (((1 << (MapLogX() - TILELOOP_BITS))-1) << TILELOOP_BITS) |
0 | 402 |
|
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
|
403 |
void RunTileLoop(void) |
0 | 404 |
{ |
1589
bac29165710f
(svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents:
1384
diff
changeset
|
405 |
TileIndex tile; |
0 | 406 |
uint count; |
407 |
||
408 |
tile = _cur_tileloop_tile; |
|
409 |
||
410 |
assert( (tile & ~TILELOOP_ASSERTMASK) == 0); |
|
863
6a1444534f62
(svn r1344) Use MapSize[XY]() (or MapSize()/MapMax[XY]() where appropriate) instead of TILES_[XY]
tron
parents:
857
diff
changeset
|
411 |
count = (MapSizeX() / TILELOOP_SIZE) * (MapSizeY() / TILELOOP_SIZE); |
0 | 412 |
do { |
1214
8262981ac274
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1211
diff
changeset
|
413 |
_tile_type_procs[GetTileType(tile)]->tile_loop_proc(tile); |
0 | 414 |
|
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:
925
diff
changeset
|
415 |
if (TileX(tile) < MapSizeX() - TILELOOP_SIZE) { |
0 | 416 |
tile += TILELOOP_SIZE; /* no overflow */ |
417 |
} else { |
|
1981 | 418 |
tile = TILE_MASK(tile - TILELOOP_SIZE * (MapSizeX() / TILELOOP_SIZE - 1) + TileDiffXY(0, TILELOOP_SIZE)); /* x would overflow, also increase y */ |
0 | 419 |
} |
420 |
} while (--count); |
|
421 |
assert( (tile & ~TILELOOP_ASSERTMASK) == 0); |
|
422 |
||
423 |
tile += 9; |
|
424 |
if (tile & TILELOOP_CHKMASK) |
|
863
6a1444534f62
(svn r1344) Use MapSize[XY]() (or MapSize()/MapMax[XY]() where appropriate) instead of TILES_[XY]
tron
parents:
857
diff
changeset
|
425 |
tile = (tile + MapSizeX()) & TILELOOP_ASSERTMASK; |
0 | 426 |
_cur_tileloop_tile = tile; |
427 |
} |
|
428 |
||
2055
4926ed1a7562
(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
|
429 |
void InitializeLandscape(void) |
0 | 430 |
{ |
3078
cfce0beffa16
(svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents:
3076
diff
changeset
|
431 |
uint maxx = MapMaxX(); |
cfce0beffa16
(svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents:
3076
diff
changeset
|
432 |
uint maxy = MapMaxY(); |
cfce0beffa16
(svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents:
3076
diff
changeset
|
433 |
uint sizex = MapSizeX(); |
cfce0beffa16
(svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents:
3076
diff
changeset
|
434 |
uint x; |
cfce0beffa16
(svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents:
3076
diff
changeset
|
435 |
uint y; |
1218 | 436 |
|
3078
cfce0beffa16
(svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents:
3076
diff
changeset
|
437 |
for (y = 0; y < maxy; y++) { |
cfce0beffa16
(svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents:
3076
diff
changeset
|
438 |
for (x = 0; x < maxx; x++) { |
cfce0beffa16
(svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents:
3076
diff
changeset
|
439 |
MakeClear(sizex * y + x, CL_GRASS, 3); |
cfce0beffa16
(svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents:
3076
diff
changeset
|
440 |
SetTileHeight(sizex * y + x, 0); |
cfce0beffa16
(svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents:
3076
diff
changeset
|
441 |
} |
cfce0beffa16
(svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents:
3076
diff
changeset
|
442 |
MakeVoid(sizex * y + x); |
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:
1999
diff
changeset
|
443 |
} |
3078
cfce0beffa16
(svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents:
3076
diff
changeset
|
444 |
for (x = 0; x < sizex; x++) MakeVoid(sizex * y + x); |
0 | 445 |
} |
446 |
||
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
|
447 |
void ConvertGroundTilesIntoWaterTiles(void) |
0 | 448 |
{ |
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
449 |
TileIndex tile = 0; |
1335
a5f223b9f549
(svn r1839) Move GetTileSlope() and GetTileZ() into tile.[ch] and use more explicit types as parameters
tron
parents:
1278
diff
changeset
|
450 |
uint h; |
0 | 451 |
|
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
452 |
for (tile = 0; tile < MapSize(); ++tile) { |
1035
812f837ee03f
(svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts
tron
parents:
959
diff
changeset
|
453 |
if (IsTileType(tile, MP_CLEAR) && GetTileSlope(tile, &h) == 0 && h == 0) { |
3111
750f37699a13
(svn r3714) Add functions to turn tiles into water and shore tiles
tron
parents:
3078
diff
changeset
|
454 |
MakeWater(tile); |
0 | 455 |
} |
456 |
} |
|
457 |
} |
|
458 |
||
459 |
static const byte _genterrain_tbl_1[5] = { 10, 22, 33, 37, 4 }; |
|
460 |
static const byte _genterrain_tbl_2[5] = { 0, 0, 0, 0, 33 }; |
|
461 |
||
462 |
static void GenerateTerrain(int type, int flag) |
|
463 |
{ |
|
464 |
uint32 r; |
|
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
465 |
uint x; |
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
466 |
uint y; |
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
467 |
uint w; |
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
468 |
uint h; |
1384
17fe20da74ef
(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
|
469 |
const Sprite* template; |
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
470 |
const byte *p; |
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:
1999
diff
changeset
|
471 |
Tile* tile; |
0 | 472 |
byte direction; |
473 |
||
474 |
r = Random(); |
|
1384
17fe20da74ef
(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
|
475 |
template = GetSprite((((r >> 24) * _genterrain_tbl_1[type]) >> 8) + _genterrain_tbl_2[type] + 4845); |
0 | 476 |
|
856
918759cedca8
(svn r1337) Use MapMax[XY]() (or MapSize[XY]() if appropriate) instead of TILE_MAX_[XY]
tron
parents:
851
diff
changeset
|
477 |
x = r & MapMaxX(); |
927
94fec9843fd3
(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
|
478 |
y = (r >> MapLogX()) & MapMaxY(); |
0 | 479 |
|
480 |
||
2951 | 481 |
if (x < 2 || y < 2) return; |
0 | 482 |
|
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:
2055
diff
changeset
|
483 |
direction = GB(r, 22, 2); |
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
484 |
if (direction & 1) { |
1384
17fe20da74ef
(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
|
485 |
w = template->height; |
17fe20da74ef
(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
|
486 |
h = template->width; |
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
487 |
} else { |
1384
17fe20da74ef
(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
|
488 |
w = template->width; |
17fe20da74ef
(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
|
489 |
h = template->height; |
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
490 |
} |
1384
17fe20da74ef
(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
|
491 |
p = template->data; |
0 | 492 |
|
493 |
if (flag & 4) { |
|
1273
e4849a568647
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
494 |
uint xw = x * MapSizeY(); |
e4849a568647
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
495 |
uint yw = y * MapSizeX(); |
e4849a568647
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
496 |
uint bias = (MapSizeX() + MapSizeY()) * 16; |
e4849a568647
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
497 |
|
e4849a568647
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
498 |
switch (flag & 3) { |
e4849a568647
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
499 |
case 0: |
e4849a568647
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
500 |
if (xw + yw > MapSize() - bias) return; |
e4849a568647
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
501 |
break; |
e4849a568647
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
502 |
|
e4849a568647
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
503 |
case 1: |
e4849a568647
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
504 |
if (yw < xw + bias) return; |
e4849a568647
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
505 |
break; |
e4849a568647
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
506 |
|
e4849a568647
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
507 |
case 2: |
e4849a568647
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
508 |
if (xw + yw < MapSize() + bias) return; |
e4849a568647
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
509 |
break; |
e4849a568647
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
510 |
|
e4849a568647
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
511 |
case 3: |
e4849a568647
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
512 |
if (xw < yw + bias) return; |
e4849a568647
(svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents:
1247
diff
changeset
|
513 |
break; |
0 | 514 |
} |
515 |
} |
|
516 |
||
2951 | 517 |
if (x + w >= MapMaxX() - 1) return; |
518 |
if (y + h >= MapMaxY() - 1) return; |
|
0 | 519 |
|
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:
1999
diff
changeset
|
520 |
tile = &_m[TileXY(x, y)]; |
0 | 521 |
|
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
522 |
switch (direction) { |
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
523 |
case 0: |
0 | 524 |
do { |
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:
1999
diff
changeset
|
525 |
Tile* tile_cur = tile; |
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
526 |
uint w_cur; |
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
527 |
|
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
528 |
for (w_cur = w; w_cur != 0; --w_cur) { |
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:
1999
diff
changeset
|
529 |
if (*p >= tile_cur->type_height) tile_cur->type_height = *p; |
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
530 |
p++; |
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
531 |
tile_cur++; |
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
532 |
} |
1981 | 533 |
tile += TileDiffXY(0, 1); |
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
534 |
} while (--h != 0); |
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
535 |
break; |
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
536 |
|
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
537 |
case 1: |
0 | 538 |
do { |
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:
1999
diff
changeset
|
539 |
Tile* tile_cur = tile; |
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
540 |
uint h_cur; |
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
541 |
|
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
542 |
for (h_cur = h; h_cur != 0; --h_cur) { |
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:
1999
diff
changeset
|
543 |
if (*p >= tile_cur->type_height) tile_cur->type_height = *p; |
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
544 |
p++; |
1981 | 545 |
tile_cur += TileDiffXY(0, 1); |
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
546 |
} |
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
547 |
tile++; |
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
548 |
} while (--w != 0); |
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
549 |
break; |
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
550 |
|
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
551 |
case 2: |
1981 | 552 |
tile += TileDiffXY(w - 1, 0); |
0 | 553 |
do { |
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:
1999
diff
changeset
|
554 |
Tile* tile_cur = tile; |
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
555 |
uint w_cur; |
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
556 |
|
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
557 |
for (w_cur = w; w_cur != 0; --w_cur) { |
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:
1999
diff
changeset
|
558 |
if (*p >= tile_cur->type_height) tile_cur->type_height = *p; |
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
559 |
p++; |
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
560 |
tile_cur--; |
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
561 |
} |
1981 | 562 |
tile += TileDiffXY(0, 1); |
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
563 |
} while (--h != 0); |
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
564 |
break; |
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
565 |
|
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
566 |
case 3: |
1981 | 567 |
tile += TileDiffXY(0, h - 1); |
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
568 |
do { |
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:
1999
diff
changeset
|
569 |
Tile* tile_cur = tile; |
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
570 |
uint h_cur; |
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
571 |
|
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
572 |
for (h_cur = h; h_cur != 0; --h_cur) { |
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:
1999
diff
changeset
|
573 |
if (*p >= tile_cur->type_height) tile_cur->type_height = *p; |
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
574 |
p++; |
1981 | 575 |
tile_cur -= TileDiffXY(0, 1); |
1278
952095d83a1a
(svn r1782) Remove line which should've been removed in r1779 and caused map generation to hang infinitely
tron
parents:
1275
diff
changeset
|
576 |
} |
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
577 |
tile++; |
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
578 |
} while (--w != 0); |
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
579 |
break; |
0 | 580 |
} |
581 |
} |
|
582 |
||
583 |
||
584 |
#include "table/genland.h" |
|
585 |
||
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
|
586 |
static void CreateDesertOrRainForest(void) |
0 | 587 |
{ |
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
588 |
TileIndex tile; |
909
65cdb609b7a6
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
589 |
const TileIndexDiffC *data; |
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
590 |
uint i; |
0 | 591 |
|
909
65cdb609b7a6
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
592 |
for (tile = 0; tile != MapSize(); ++tile) { |
65cdb609b7a6
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
593 |
for (data = _make_desert_or_rainforest_data; |
65cdb609b7a6
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
594 |
data != endof(_make_desert_or_rainforest_data); ++data) { |
1184
9792417da988
(svn r1686) Fix (Work around?) crash when generating tropical maps
tron
parents:
1181
diff
changeset
|
595 |
TileIndex t = TILE_MASK(tile + ToTileIndexDiff(*data)); |
1044
63e0601a43cc
(svn r1545) Add TileHeight() which returns the height (not multiplied by 8)
tron
parents:
1035
diff
changeset
|
596 |
if (TileHeight(t) >= 4 || IsTileType(t, MP_WATER)) break; |
909
65cdb609b7a6
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
597 |
} |
65cdb609b7a6
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
598 |
if (data == endof(_make_desert_or_rainforest_data)) |
65cdb609b7a6
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
599 |
SetMapExtraBits(tile, 1); |
65cdb609b7a6
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
600 |
} |
183
ec2b02ea4c88
(svn r184) -Fix: starting a new game in DesertLandscape crashed the game
truelight
parents:
159
diff
changeset
|
601 |
|
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
602 |
for (i = 0; i != 256; i++) |
0 | 603 |
RunTileLoop(); |
604 |
||
909
65cdb609b7a6
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
605 |
for (tile = 0; tile != MapSize(); ++tile) { |
65cdb609b7a6
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
606 |
for (data = _make_desert_or_rainforest_data; |
65cdb609b7a6
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
607 |
data != endof(_make_desert_or_rainforest_data); ++data) { |
65cdb609b7a6
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
608 |
TileIndex t = TILE_MASK(tile + ToTileIndexDiff(*data)); |
2955
24de69e236d2
(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
|
609 |
if (IsTileType(t, MP_CLEAR) && IsClearGround(t, CL_DESERT)) break; |
909
65cdb609b7a6
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
610 |
} |
65cdb609b7a6
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
611 |
if (data == endof(_make_desert_or_rainforest_data)) |
65cdb609b7a6
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
612 |
SetMapExtraBits(tile, 2); |
65cdb609b7a6
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
613 |
} |
0 | 614 |
} |
615 |
||
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
|
616 |
void GenerateLandscape(void) |
0 | 617 |
{ |
1275
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
618 |
uint i; |
5d1b5fe31c78
(svn r1779) Make the map generation code slightly more readable
tron
parents:
1273
diff
changeset
|
619 |
uint flag; |
0 | 620 |
uint32 r; |
183
ec2b02ea4c88
(svn r184) -Fix: starting a new game in DesertLandscape crashed the game
truelight
parents:
159
diff
changeset
|
621 |
|
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:
2955
diff
changeset
|
622 |
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:
2955
diff
changeset
|
623 |
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:
2955
diff
changeset
|
624 |
for (i = ScaleByMapSize((Random() & 0x7F) + 950); i != 0; --i) { |
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:
2955
diff
changeset
|
625 |
GenerateTerrain(2, 0); |
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:
2955
diff
changeset
|
626 |
} |
183
ec2b02ea4c88
(svn r184) -Fix: starting a new game in DesertLandscape crashed the game
truelight
parents:
159
diff
changeset
|
627 |
|
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:
2955
diff
changeset
|
628 |
r = Random(); |
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:
2955
diff
changeset
|
629 |
flag = GB(r, 0, 2) | 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:
2955
diff
changeset
|
630 |
for (i = ScaleByMapSize(GB(r, 16, 7) + 450); i != 0; --i) { |
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:
2955
diff
changeset
|
631 |
GenerateTerrain(4, flag); |
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:
2955
diff
changeset
|
632 |
} |
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:
2955
diff
changeset
|
633 |
break; |
0 | 634 |
|
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:
2955
diff
changeset
|
635 |
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:
2955
diff
changeset
|
636 |
for (i = ScaleByMapSize((Random() & 0x7F) + 170); i != 0; --i) { |
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:
2955
diff
changeset
|
637 |
GenerateTerrain(0, 0); |
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:
2955
diff
changeset
|
638 |
} |
0 | 639 |
|
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:
2955
diff
changeset
|
640 |
r = Random(); |
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:
2955
diff
changeset
|
641 |
flag = GB(r, 0, 2) | 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:
2955
diff
changeset
|
642 |
for (i = ScaleByMapSize(GB(r, 16, 8) + 1700); i != 0; --i) { |
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:
2955
diff
changeset
|
643 |
GenerateTerrain(0, flag); |
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:
2955
diff
changeset
|
644 |
} |
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:
2955
diff
changeset
|
645 |
|
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:
2955
diff
changeset
|
646 |
flag ^= 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:
2955
diff
changeset
|
647 |
|
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:
2955
diff
changeset
|
648 |
for (i = ScaleByMapSize((Random() & 0x7F) + 410); i != 0; --i) { |
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:
2955
diff
changeset
|
649 |
GenerateTerrain(3, flag); |
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:
2955
diff
changeset
|
650 |
} |
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:
2955
diff
changeset
|
651 |
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:
2955
diff
changeset
|
652 |
|
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:
2955
diff
changeset
|
653 |
default: |
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:
2955
diff
changeset
|
654 |
i = ScaleByMapSize((Random() & 0x7F) + (3 - _opt.diff.quantity_sea_lakes) * 256 + 100); |
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:
2955
diff
changeset
|
655 |
for (; i != 0; --i) { |
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:
2955
diff
changeset
|
656 |
GenerateTerrain(_opt.diff.terrain_type, 0); |
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:
2955
diff
changeset
|
657 |
} |
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:
2955
diff
changeset
|
658 |
break; |
0 | 659 |
} |
660 |
||
661 |
ConvertGroundTilesIntoWaterTiles(); |
|
662 |
||
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:
2955
diff
changeset
|
663 |
if (_opt.landscape == LT_DESERT) CreateDesertOrRainForest(); |
0 | 664 |
} |
665 |
||
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
|
666 |
void OnTick_Town(void); |
4fdc46eaf423
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1059
diff
changeset
|
667 |
void OnTick_Trees(void); |
4fdc46eaf423
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1059
diff
changeset
|
668 |
void OnTick_Station(void); |
4fdc46eaf423
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1059
diff
changeset
|
669 |
void OnTick_Industry(void); |
0 | 670 |
|
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
|
671 |
void OnTick_Players(void); |
4fdc46eaf423
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1059
diff
changeset
|
672 |
void OnTick_Train(void); |
0 | 673 |
|
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
|
674 |
void CallLandscapeTick(void) |
0 | 675 |
{ |
676 |
OnTick_Town(); |
|
677 |
OnTick_Trees(); |
|
678 |
OnTick_Station(); |
|
679 |
OnTick_Industry(); |
|
680 |
||
681 |
OnTick_Players(); |
|
682 |
OnTick_Train(); |
|
683 |
} |
|
684 |
||
685 |
TileIndex AdjustTileCoordRandomly(TileIndex a, byte rng) |
|
686 |
{ |
|
687 |
int rn = rng; |
|
688 |
uint32 r = Random(); |
|
689 |
||
1981 | 690 |
return TILE_MASK(TileXY( |
2150
f710b959b1c4
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2140
diff
changeset
|
691 |
TileX(a) + (GB(r, 0, 8) * rn * 2 >> 8) - rn, |
f710b959b1c4
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2140
diff
changeset
|
692 |
TileY(a) + (GB(r, 8, 8) * rn * 2 >> 8) - rn |
1174
6a5e747f3ba6
(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
|
693 |
)); |
0 | 694 |
} |
695 |
||
1589
bac29165710f
(svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents:
1384
diff
changeset
|
696 |
bool IsValidTile(TileIndex tile) |
0 | 697 |
{ |
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:
925
diff
changeset
|
698 |
return (tile < MapSizeX() * MapMaxY() && TileX(tile) != MapMaxX()); |
0 | 699 |
} |