diff options
| author | rubidium <rubidium@openttd.org> | 2009-08-09 19:06:35 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-08-09 19:06:35 +0000 |
| commit | 35d5a197d6f93e05eb358ed0a30db9ab2645911b (patch) | |
| tree | 22e39a3193bdf0b35c6234c0747c30a3487e8bf1 | |
| parent | ed9c01e8b04305dc62f7173649f44bd27ac4b623 (diff) | |
| download | openttd-35d5a197d6f93e05eb358ed0a30db9ab2645911b.tar.xz | |
(svn r17138) -Fix: some MSVC 64 bits compiler warnings
| -rw-r--r-- | src/saveload/waypoint_sl.cpp | 2 | ||||
| -rw-r--r-- | src/settings_gui.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/saveload/waypoint_sl.cpp b/src/saveload/waypoint_sl.cpp index c424e5739..dccfb86aa 100644 --- 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 index 602ed2c0c..5578cc8cd 100644 --- 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 */ |