diff options
| author | rubidium <rubidium@openttd.org> | 2009-11-29 01:00:03 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-11-29 01:00:03 +0000 |
| commit | 736e0c18cc4ab82d3b0cc0675a82165b8fa60429 (patch) | |
| tree | ac9da1009ca1751a5ab87fbe8106147bb6efad56 | |
| parent | 5d38d06313b3c2bc440283cc15cb1e86aa48cbf4 (diff) | |
| download | openttd-736e0c18cc4ab82d3b0cc0675a82165b8fa60429.tar.xz | |
(svn r18332) -Fix: the MSVC compile warnings
| -rw-r--r-- | src/ai/ai_gui.cpp | 2 | ||||
| -rw-r--r-- | src/signs_gui.cpp | 2 | ||||
| -rw-r--r-- | src/smallmap_gui.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp index 179674f5c..21338040b 100644 --- a/src/ai/ai_gui.cpp +++ b/src/ai/ai_gui.cpp @@ -310,7 +310,7 @@ struct AISettingsWindow : public Window { for (; this->vscroll.IsVisible(i) && it != config->GetConfigList()->end(); i++, it++) { int current_value = config->GetSetting((*it).name); - int x = rtl ? r.right : r.left; + uint x = rtl ? r.right : r.left; if (((*it).flags & AICONFIG_BOOLEAN) != 0) { DrawFrameRect(buttons_left, y + 2, buttons_left + 19, y + 10, (current_value != 0) ? COLOUR_GREEN : COLOUR_RED, (current_value != 0) ? FR_LOWERED : FR_NONE); } else { diff --git a/src/signs_gui.cpp b/src/signs_gui.cpp index 0baf3e70b..3b69bb0cb 100644 --- a/src/signs_gui.cpp +++ b/src/signs_gui.cpp @@ -173,7 +173,7 @@ struct SignListWindow : Window, SignList { } break; case SLW_CAPTION: - SetDParam(0, max<uint>(1000, Sign::GetPoolSize())); + SetDParam(0, max<size_t>(1000, Sign::GetPoolSize())); *size = GetStringBoundingBox(STR_SIGN_LIST_CAPTION); size->height += padding.height; size->width += padding.width; diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp index 60c287296..d83031b2f 100644 --- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -917,7 +917,7 @@ public: if (tbl->col_break || i++ >= this->number_of_rows) { /* Column break needed, continue at top, COLUMN_WIDTH pixels * (one "row") to the right. */ - x += rtl ? -this->column_width : this->column_width; + x += rtl ? -(int)this->column_width : this->column_width; y = y_org; i = 0; } |