summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2007-12-14 00:25:00 +0000
committerglx <glx@openttd.org>2007-12-14 00:25:00 +0000
commitea1ae563c706512dc3cf8f8cda3be96feba32015 (patch)
treec2518d2ea3be7b7691294466ded2268560e30617
parent2921e7482bcced7865aad691459d6e80606b76ce (diff)
downloadopenttd-ea1ae563c706512dc3cf8f8cda3be96feba32015.tar.xz
(svn r11631) -Fix (r11585, r11626): remove MSVC warnings
-rw-r--r--src/main_gui.cpp8
-rw-r--r--src/newgrf_gui.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main_gui.cpp b/src/main_gui.cpp
index 82faefb59..f1d8d447d 100644
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -1677,12 +1677,12 @@ static void MainToolbarWndProc(Window *w, WindowEvent *e)
} break;
case WE_MOUSELOOP:
- if (w->IsWidgetLowered(0) != (bool)_pause_game) {
+ if (w->IsWidgetLowered(0) != !!_pause_game) {
w->ToggleWidgetLoweredState(0);
w->InvalidateWidget(0);
}
- if (w->IsWidgetLowered(1) != (bool)_fast_forward) {
+ if (w->IsWidgetLowered(1) != !!_fast_forward) {
w->ToggleWidgetLoweredState(1);
w->InvalidateWidget(1);
}
@@ -1986,12 +1986,12 @@ static void ScenEditToolbarWndProc(Window *w, WindowEvent *e)
} break;
case WE_MOUSELOOP:
- if (w->IsWidgetLowered(0) != (bool)_pause_game) {
+ if (w->IsWidgetLowered(0) != !!_pause_game) {
w->ToggleWidgetLoweredState(0);
SetWindowDirty(w);
}
- if (w->IsWidgetLowered(1) != (bool)_fast_forward) {
+ if (w->IsWidgetLowered(1) != !!_fast_forward) {
w->ToggleWidgetLoweredState(1);
SetWindowDirty(w);
}
diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp
index 6e05d4f51..fbd4934a7 100644
--- a/src/newgrf_gui.cpp
+++ b/src/newgrf_gui.cpp
@@ -131,7 +131,7 @@ static void NewGRFAddDlgWndProc(Window *w, WindowEvent *e)
case WE_PAINT: {
const GRFConfig *c;
const Widget *wl = &w->widget[ANGRFW_GRF_LIST];
- uint n = 0;
+ int n = 0;
/* Count the number of GRFs */
for (c = _all_grfs; c != NULL; c = c->next) n++;