From e2de86f9517b9f593d5c5f7c6f5a68cb236ab777 Mon Sep 17 00:00:00 2001 From: glx Date: Fri, 8 Feb 2008 17:53:01 +0000 Subject: (svn r12087) -Fix: MSVC warnings --- src/settings_gui.cpp | 2 +- src/tree_cmd.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 939bee7cf..c835a3b06 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -557,7 +557,7 @@ static void GameDifficultyWndProc(Window *w, WindowEvent *e) value = ((GDType*)&_opt_mod_temp.diff)[i]; DrawArrowButtons(5, y, 3, - (diffic_d->clicked_button == i) ? 1 << diffic_d->clicked_increase : 0, + (diffic_d->clicked_button == i) ? 1 + !!diffic_d->clicked_increase : 0, !(HasBit(disabled, i) || gsd->min == value), !(HasBit(disabled, i) || gsd->max == value)); diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp index 4a996dbba..1184bfd52 100644 --- a/src/tree_cmd.cpp +++ b/src/tree_cmd.cpp @@ -498,7 +498,7 @@ static void DrawTile_Trees(TileInfo *ti) uint mi = 0; for (uint i = 1; i < trees; i++) { - if (te[i].x + te[i].y < min) { + if ((uint)(te[i].x + te[i].y) < min) { min = te[i].x + te[i].y; mi = i; } -- cgit v1.2.3-54-g00ecf