summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2008-02-08 17:53:01 +0000
committerglx <glx@openttd.org>2008-02-08 17:53:01 +0000
commite2de86f9517b9f593d5c5f7c6f5a68cb236ab777 (patch)
tree8a4c3b6ffc8f6e4ec69d37e7e8891ecde4a3d379 /src
parent731137678cc61fed69fe621d0146f07672934920 (diff)
downloadopenttd-e2de86f9517b9f593d5c5f7c6f5a68cb236ab777.tar.xz
(svn r12087) -Fix: MSVC warnings
Diffstat (limited to 'src')
-rw-r--r--src/settings_gui.cpp2
-rw-r--r--src/tree_cmd.cpp2
2 files changed, 2 insertions, 2 deletions
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;
}