summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2010-01-17 00:51:18 +0000
committerfrosch <frosch@openttd.org>2010-01-17 00:51:18 +0000
commit707cf045f8703700887757ecfa4e309b61e2fd4f (patch)
treea41bf46b433b8aa266d42846facb80234176abff
parent2e9529aff3a94bbd77958244fbc56da278eb5204 (diff)
downloadopenttd-707cf045f8703700887757ecfa4e309b61e2fd4f.tar.xz
(svn r18841) -Fix (r16869): Default-waypoint was drawn incorrectly for monorail and maglev in the waypoint picker.
-rw-r--r--src/station_cmd.cpp3
-rw-r--r--src/train_cmd.cpp2
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;