mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-02-03 21:06:58 +00:00
(svn r19738) -Fix: MSVC 64 bits compile warnings
This commit is contained in:
parent
247d1aa395
commit
ac9af8e1e1
@ -624,7 +624,7 @@ struct SpriteAlignerWindow : Window {
|
||||
int step_size = nwid->resize_y;
|
||||
|
||||
SmallVector<SpriteID, 256> &list = _newgrf_debug_sprite_picker.sprites;
|
||||
int max = min(this->vscroll.GetPosition() + this->vscroll.GetCapacity(), list.Length());
|
||||
int max = min<int>(this->vscroll.GetPosition() + this->vscroll.GetCapacity(), list.Length());
|
||||
|
||||
int y = r.top + WD_FRAMERECT_TOP;
|
||||
for (int i = this->vscroll.GetPosition(); i < max; i++) {
|
||||
|
@ -73,7 +73,7 @@ void MoveWaypointsToBaseStations()
|
||||
if (wp->delete_ctr != 0) continue; // The waypoint was deleted
|
||||
|
||||
/* Waypoint indices were not added to the map prior to this. */
|
||||
_m[wp->xy].m2 = wp->index;
|
||||
_m[wp->xy].m2 = (StationID)wp->index;
|
||||
|
||||
if (HasBit(_m[wp->xy].m3, 4)) {
|
||||
wp->spec = GetCustomStationSpec(STAT_CLASS_WAYP, _m[wp->xy].m4 + 1);
|
||||
|
Loading…
Reference in New Issue
Block a user