1
0
Fork 0

(svn r3341) -Codechange: make mingw32 happy, and renamed Rectangle, because it already exists on that platform

release/0.4.5
truelight 2005-12-25 15:05:59 +00:00
parent 19d0517c71
commit 8ffe9da482
1 changed files with 4 additions and 4 deletions

View File

@ -606,14 +606,14 @@ void GetAcceptanceAroundTiles(AcceptedCargo accepts, TileIndex tile,
} }
} }
typedef struct Rectangle { typedef struct ottd_Rectangle {
uint min_x; uint min_x;
uint min_y; uint min_y;
uint max_x; uint max_x;
uint max_y; uint max_y;
} Rectangle; } ottd_Rectangle;
static void MergePoint(Rectangle* rect, TileIndex tile) static void MergePoint(ottd_Rectangle* rect, TileIndex tile)
{ {
uint x = TileX(tile); uint x = TileX(tile);
uint y = TileY(tile); uint y = TileY(tile);
@ -631,7 +631,7 @@ static void UpdateStationAcceptance(Station *st, bool show_msg)
uint old_acc, new_acc; uint old_acc, new_acc;
const RoadStop *cur_rs; const RoadStop *cur_rs;
int i; int i;
Rectangle rect; ottd_Rectangle rect;
int rad; int rad;
AcceptedCargo accepts; AcceptedCargo accepts;