From 3f2d2d8f3726801fd179bbb41ecd785befc320e8 Mon Sep 17 00:00:00 2001 From: truelight Date: Sat, 18 Dec 2004 13:38:27 +0000 Subject: (svn r1153) -Fix: FindCatchmentRadius is now a function that uses the enums instead of magic numbers (tnx to Stumo) --- macros.h | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'macros.h') diff --git a/macros.h b/macros.h index 584006312..61351d9e1 100644 --- a/macros.h +++ b/macros.h @@ -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; \ -- cgit v1.2.3-54-g00ecf