# HG changeset patch # User rubidium # Date 2009-08-09 19:06:35 # Node ID b1d9a3d92e8961644b32721850d39e378280cffa # Parent 23a624253176086a51d8d8909eb77295b65d9484 (svn r17138) -Fix: some MSVC 64 bits compiler warnings diff --git a/src/saveload/waypoint_sl.cpp b/src/saveload/waypoint_sl.cpp --- a/src/saveload/waypoint_sl.cpp +++ b/src/saveload/waypoint_sl.cpp @@ -47,7 +47,7 @@ static void UpdateWaypointOrder(Order *o for (OldWaypoint *wp = _old_waypoints.Begin(); wp != _old_waypoints.End(); wp++) { if (wp->index != o->GetDestination()) continue; - o->SetDestination(wp->new_index); + o->SetDestination((DestinationID)wp->new_index); return; } } diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -615,7 +615,7 @@ public: if (x >= 10) { /* Increase button clicked */ - val = min(val + sdb->interval, sdb->max); + val = min(val + sdb->interval, (int32)sdb->max); this->clicked_increase = true; } else { /* Decrease button clicked */