mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r19334) -Codechange: method-call codestyle fixes, and introduction of const reference formal parameter.

release/1.1
alberth 2010-03-06 11:54:59 +00:00
parent c7a5695d9d
commit 993c9e6f62
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/base_station_base.h
View File

@ -46,7 +46,7 @@ struct StationRect : public Rect {
static bool ScanForStationTiles(StationID st_id, int left_a, int top_a, int right_a, int bottom_a); static bool ScanForStationTiles(StationID st_id, int left_a, int top_a, int right_a, int bottom_a);
StationRect& operator = (Rect src); StationRect& operator = (const Rect &src);
}; };
/** Base class for all station-ish types */ /** Base class for all station-ish types */

12
src/station.cpp
View File

@ -370,13 +370,13 @@ bool StationRect::BeforeAddTile(TileIndex tile, StationRectMode mode)
{ {
int x = TileX(tile); int x = TileX(tile);
int y = TileY(tile); int y = TileY(tile);
if (IsEmpty()) { if (this->IsEmpty()) {
/* we are adding the first station tile */ /* we are adding the first station tile */
if (mode != ADD_TEST) { if (mode != ADD_TEST) {
this->left = this->right = x; this->left = this->right = x;
this->top = this->bottom = y; this->top = this->bottom = y;
} }
} else if (!PtInExtendedRect(x, y)) { } else if (!this->PtInExtendedRect(x, y)) {
/* current rect is not empty and new point is outside this rect /* current rect is not empty and new point is outside this rect
* make new spread-out rectangle */ * make new spread-out rectangle */
Rect new_rect = {min(x, this->left), min(y, this->top), max(x, this->right), max(y, this->bottom)}; Rect new_rect = {min(x, this->left), min(y, this->top), max(x, this->right), max(y, this->bottom)};
@ -481,15 +481,15 @@ bool StationRect::AfterRemoveTile(BaseStation *st, TileIndex tile)
bool StationRect::AfterRemoveRect(BaseStation *st, TileIndex tile, int w, int h) bool StationRect::AfterRemoveRect(BaseStation *st, TileIndex tile, int w, int h)
{ {
assert(PtInExtendedRect(TileX(tile), TileY(tile))); assert(this->PtInExtendedRect(TileX(tile), TileY(tile)));
assert(PtInExtendedRect(TileX(tile) + w - 1, TileY(tile) + h - 1)); assert(this->PtInExtendedRect(TileX(tile) + w - 1, TileY(tile) + h - 1));
bool empty = this->AfterRemoveTile(st, tile); bool empty = this->AfterRemoveTile(st, tile);
if (w != 1 || h != 1) empty = empty || AfterRemoveTile(st, TILE_ADDXY(tile, w - 1, h - 1)); if (w != 1 || h != 1) empty = empty || this->AfterRemoveTile(st, TILE_ADDXY(tile, w - 1, h - 1));
return empty; return empty;
} }
StationRect& StationRect::operator = (Rect src) StationRect& StationRect::operator = (const Rect &src)
{ {
this->left = src.left; this->left = src.left;
this->top = src.top; this->top = src.top;