summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-04-29 18:28:24 +0000
committerrubidium <rubidium@openttd.org>2010-04-29 18:28:24 +0000
commitac9af8e1e174075266eba3c59d863804a5a5b3c2 (patch)
treeaf4f89c9b8d6d6f8d1cc2d9d5b0f893b050f1346 /src
parent247d1aa3959548c020027fc66eab9a7e1dc0cc99 (diff)
downloadopenttd-ac9af8e1e174075266eba3c59d863804a5a5b3c2.tar.xz
(svn r19738) -Fix: MSVC 64 bits compile warnings
Diffstat (limited to 'src')
-rw-r--r--src/newgrf_debug_gui.cpp2
-rw-r--r--src/saveload/waypoint_sl.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/newgrf_debug_gui.cpp b/src/newgrf_debug_gui.cpp
index b53c2ae5b..703edf905 100644
--- a/src/newgrf_debug_gui.cpp
+++ b/src/newgrf_debug_gui.cpp
@@ -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++) {
diff --git a/src/saveload/waypoint_sl.cpp b/src/saveload/waypoint_sl.cpp
index ae5c36ac1..e82f7e26e 100644
--- a/src/saveload/waypoint_sl.cpp
+++ b/src/saveload/waypoint_sl.cpp
@@ -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);