Mercurial > hg > openttd

changeset 13806:efb571d2550d draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r18332) -Fix: the MSVC compile warnings
author rubidium <rubidium@openttd.org>
date Sun, 29 Nov 2009 01:00:03 +0000
parents 97e8f494b7b9
children a743e8287d61
files src/ai/ai_gui.cpp src/signs_gui.cpp src/smallmap_gui.cpp
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -310,7 +310,7 @@
 		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 {
--- a/src/signs_gui.cpp
+++ b/src/signs_gui.cpp
@@ -173,7 +173,7 @@
 			} 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;
--- a/src/smallmap_gui.cpp
+++ b/src/smallmap_gui.cpp
@@ -917,7 +917,7 @@
 					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;
 					}