Mercurial > hg > openttd
changeset 15112:01577e93d2d1 draft
(svn r19738) -Fix: MSVC 64 bits compile warnings
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Thu, 29 Apr 2010 18:28:24 +0000 |
| parents | 857419aa684c |
| children | 4aaf8647d5b4 |
| files | src/newgrf_debug_gui.cpp src/saveload/waypoint_sl.cpp |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/newgrf_debug_gui.cpp +++ b/src/newgrf_debug_gui.cpp @@ -624,7 +624,7 @@ 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++) {
--- a/src/saveload/waypoint_sl.cpp +++ b/src/saveload/waypoint_sl.cpp @@ -73,7 +73,7 @@ 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);