petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r1153) -Fix: FindCatchmentRadius is now a function that uses the enums instead

Browse Source 
of magic numbers (tnx to Stumo)
This commit is contained in:
truelight
2004-12-18 13:38:27 +00:00
parent 88b94c3c67
commit 3f2d2d8f37
2 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
macros.h
View File

@@ -165,16 +165,6 @@ static inline int FindFirstBit2x64(int value)
#define CHANCE16R(a,b,r) ((uint16)(r=Random()) <= (uint16)((65536 * a) / b))
#define CHANCE16I(a,b,v) ((uint16)(v) <= (uint16)((65536 * a) / b))
#define FIND_CATCHMENT_RADIUS(st,rad) \
{\
if (st->bus_tile || st->lorry_tile || (st->airport_tile && st->airport_type == AT_OILRIG)) rad = 3; \
if (st->train_tile || (st->airport_tile && (st->airport_type == AT_HELIPORT || st->airport_type == AT_SMALL))) rad = 4; \
if (st->dock_tile || (st->airport_tile && st->airport_type == AT_LARGE)) rad = 5; \
if (st->airport_tile && st->airport_type == AT_METROPOLITAN) rad = 6; \
if (st->airport_tile && st->airport_type == AT_INTERNATIONAL) rad = 8; }
#define BEGIN_TILE_LOOP(var,w,h,tile) \
{int h_cur = h; \
uint var = tile; \