cpp/openttd-patchpack/source Changeset - r8512:a6251235c520

Changeset - r8512:a6251235c520

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

glx - 16 years ago 2008-02-08 17:53:01
glx@openttd.org

(svn r12087) -Fix: MSVC warnings

2 files changed with 2 insertions and 2 deletions:

src/settings_gui.cpp

src/tree_cmd.cpp

0 comments (0 inline, 0 general)

src/settings_gui.cpp

➞

Show inline comments

@@ @@ -554,13 +554,13 @@ static void GameDifficultyWndProc(Window @@
 			int y = GAMEDIFF_WND_TOP_OFFSET;
 			for (uint i = 0; i != GAME_DIFFICULTY_NUM; i++) {
 				const GameSettingData *gsd = &_game_setting_info[i];
 				value = ((GDType*)&_opt_mod_temp.diff)[i];
 				DrawArrowButtons(5, y, 3,
-						(diffic_d->clicked_button == i) ? 1 << diffic_d->clicked_increase : 0,
+						(diffic_d->clicked_button == i) ? 1 + !!diffic_d->clicked_increase : 0,
 						!(HasBit(disabled, i) || gsd->min == value),
 						!(HasBit(disabled, i) || gsd->max == value));
 				value += _game_setting_info[i].str;
 				if (i == 4) value *= 1000; // XXX - handle currency option
 				SetDParam(0, value);

src/tree_cmd.cpp

➞

Show inline comments

@@ @@ -495,13 +495,13 @@ static void DrawTile_Trees(TileInfo *ti) @@
 	for (; trees > 0; trees--) {
 		uint min = te[0].x + te[0].y;
 		uint mi = 0;
 		for (uint i = 1; i < trees; i++) {
 			if (te[i].x + te[i].y < min) {
+			if ((uint)(te[i].x + te[i].y) < min) {
 				min = te[i].x + te[i].y;
 				mi = i;
+			}
+		}
 		AddSortableSpriteToDraw(te[mi].image, te[mi].pal, ti->x + te[mi].x, ti->y + te[mi].y, 16 - te[mi].x, 16 - te[mi].y, 0x30, z, IsTransparencySet(TO_TREES), -te[mi].x, -te[mi].y);

0 comments (0 inline, 0 general)