mirror of https://github.com/OpenTTD/OpenTTD
(svn r18332) -Fix: the MSVC compile warnings
parent
5d38d06313
commit
736e0c18cc
|
@ -310,7 +310,7 @@ struct AISettingsWindow : public Window {
|
||||||
for (; this->vscroll.IsVisible(i) && it != config->GetConfigList()->end(); i++, it++) {
|
for (; this->vscroll.IsVisible(i) && it != config->GetConfigList()->end(); i++, it++) {
|
||||||
int current_value = config->GetSetting((*it).name);
|
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) {
|
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);
|
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 {
|
} else {
|
||||||
|
|
|
@ -173,7 +173,7 @@ struct SignListWindow : Window, SignList {
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
case SLW_CAPTION:
|
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 = GetStringBoundingBox(STR_SIGN_LIST_CAPTION);
|
||||||
size->height += padding.height;
|
size->height += padding.height;
|
||||||
size->width += padding.width;
|
size->width += padding.width;
|
||||||
|
|
|
@ -917,7 +917,7 @@ public:
|
||||||
if (tbl->col_break || i++ >= this->number_of_rows) {
|
if (tbl->col_break || i++ >= this->number_of_rows) {
|
||||||
/* Column break needed, continue at top, COLUMN_WIDTH pixels
|
/* Column break needed, continue at top, COLUMN_WIDTH pixels
|
||||||
* (one "row") to the right. */
|
* (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;
|
y = y_org;
|
||||||
i = 0;
|
i = 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue