cpp/openttd-patchpack/source Changeset - r13796:afb1741ef553

Changeset - r13796:afb1741ef553

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 15 years ago 2009-11-29 01:00:03
rubidium@openttd.org

(svn r18332) -Fix: the MSVC compile warnings

3 files changed with 3 insertions and 3 deletions:

src/ai/ai_gui.cpp

src/signs_gui.cpp

src/smallmap_gui.cpp

0 comments (0 inline, 0 general)

src/ai/ai_gui.cpp

➞

Show inline comments

@@ @@ -307,13 +307,13 @@ struct AISettingsWindow : public Window @@
 		int y = r.top;
 		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 {
 				DrawArrowButtons(buttons_left, y + 2, COLOUR_YELLOW, (this->clicked_button == i) ? 1 + (this->clicked_increase != rtl) : 0, current_value > (*it).min_value, current_value < (*it).max_value);
 				if (it->labels != NULL && it->labels->Find(current_value) != it->labels->End()) {
 					x = DrawString(value_left, value_right, y + WD_MATRIX_TOP, it->labels->Find(current_value)->second, TC_ORANGE);

src/signs_gui.cpp

➞

Show inline comments

@@ @@ -170,13 +170,13 @@ struct SignListWindow : Window, SignList @@
 				resize->height = max<uint>(FONT_HEIGHT_NORMAL, GetSpriteSize(SPR_COMPANY_ICON).height);
 				Dimension d = {this->text_offset + MAX_LENGTH_SIGN_NAME_PIXELS + WD_FRAMETEXT_RIGHT, WD_FRAMERECT_TOP + 5 * resize->height + WD_FRAMERECT_BOTTOM};
 				*size = maxdim(*size, d);
 			} 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;
 				break;
+		}
+	}

src/smallmap_gui.cpp

➞

Show inline comments

@@ @@ -914,13 +914,13 @@ public: @@
 				uint blob_right = rtl ? this->column_width - 1 : LEGEND_BLOB_WIDTH;
 				for (const LegendAndColour *tbl = _legend_table[this->map_type]; !tbl->end; ++tbl) {
 					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;
+					}
 					if (this->map_type == SMT_INDUSTRY) {
 						/* Industry name must be formated, since it's not in tiny font in the specs.

0 comments (0 inline, 0 general)