From 707cf045f8703700887757ecfa4e309b61e2fd4f Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 17 Jan 2010 00:51:18 +0000 Subject: (svn r18841) -Fix (r16869): Default-waypoint was drawn incorrectly for monorail and maglev in the waypoint picker. --- src/station_cmd.cpp | 3 ++- src/train_cmd.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 9fcd078f2..41c21751e 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -2476,7 +2476,8 @@ void StationPickerDrawSprite(int x, int y, StationType st, RailType railtype, Ro DrawSprite(SPR_TRAMWAY_TRAM + (t->ground.sprite == SPR_ROAD_PAVED_STRAIGHT_X ? 1 : 0), PAL_NONE, x, y); } - DrawCommonTileSeqInGUI(x, y, t, total_offset, 0, pal); + /* Default waypoint has no railtype specific sprites */ + DrawCommonTileSeqInGUI(x, y, t, st == STATION_WAYPOINT ? 0 : total_offset, 0, pal); } static uint GetSlopeZ_Station(TileIndex tile, uint x, uint y) diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index b5a24bfa4..56c006440 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -2946,7 +2946,7 @@ int Train::UpdateSpeed() this->max_speed = this->GetCurrentMaxSpeed(); accel = this->GetAcceleration(); break; - } + } uint spd = this->subspeed + accel; this->subspeed = (byte)spd; -- cgit v1.2.3-70-g09d2