summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralberth <alberth@openttd.org>2010-03-06 11:54:59 +0000
committeralberth <alberth@openttd.org>2010-03-06 11:54:59 +0000
commit993c9e6f626a4cddb273323e6fea9d05dc68b03f (patch)
tree11866f6aa5ce5e1545c5fd3d2849fa1852878777
parentc7a5695d9db5f439321d5f953a853313d2d3d0ed (diff)
downloadopenttd-993c9e6f626a4cddb273323e6fea9d05dc68b03f.tar.xz
(svn r19334) -Codechange: method-call codestyle fixes, and introduction of const reference formal parameter.
-rw-r--r--src/base_station_base.h2
-rw-r--r--src/station.cpp12
2 files changed, 7 insertions, 7 deletions
diff --git a/src/base_station_base.h b/src/base_station_base.h
index 6a157dfcb..5718edc48 100644
--- a/src/base_station_base.h
+++ b/src/base_station_base.h
@@ -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);
- StationRect& operator = (Rect src);
+ StationRect& operator = (const Rect &src);
};
/** Base class for all station-ish types */
diff --git a/src/station.cpp b/src/station.cpp
index 039be313e..ff4d82305 100644
--- a/src/station.cpp
+++ b/src/station.cpp
@@ -370,13 +370,13 @@ bool StationRect::BeforeAddTile(TileIndex tile, StationRectMode mode)
{
int x = TileX(tile);
int y = TileY(tile);
- if (IsEmpty()) {
+ if (this->IsEmpty()) {
/* we are adding the first station tile */
if (mode != ADD_TEST) {
this->left = this->right = x;
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
* make new spread-out rectangle */
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)
{
- assert(PtInExtendedRect(TileX(tile), TileY(tile)));
- assert(PtInExtendedRect(TileX(tile) + w - 1, TileY(tile) + h - 1));
+ assert(this->PtInExtendedRect(TileX(tile), TileY(tile)));
+ assert(this->PtInExtendedRect(TileX(tile) + w - 1, TileY(tile) + h - 1));
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;
}
-StationRect& StationRect::operator = (Rect src)
+StationRect& StationRect::operator = (const Rect &src)
{
this->left = src.left;
this->top = src.top;