Changeset - r8512:a6251235c520
[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:
0 comments (0 inline, 0 general)
src/settings_gui.cpp
Show inline comments
 
@@ -548,25 +548,25 @@ static void GameDifficultyWndProc(Window
 
				disabled = MAX_UVALUE(uint32); // Disable all
 
			} else if (_game_mode == GM_NORMAL) {
 
				disabled = DIFF_INGAME_DISABLED_BUTTONS;
 
			}
 

	
 
			int value;
 
			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);
 
				DrawString(30, y, STR_6805_MAXIMUM_NO_COMPETITORS + i, TC_FROMSTRING);
 

	
 
				y += GAMEDIFF_WND_ROWSIZE + 2; // space items apart a bit
 
			}
 
		} break;
 

	
src/tree_cmd.cpp
Show inline comments
 
@@ -489,25 +489,25 @@ static void DrawTile_Trees(TileInfo *ti)
 
		s++;
 
		d++;
 
	}
 

	
 
	/* draw them in a sorted way */
 
	byte z = ti->z + GetSlopeMaxZ(ti->tileh) / 2;
 

	
 
	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);
 

	
 
		/* replace the removed one with the last one */
 
		te[mi] = te[trees - 1];
 
	}
 

	
 
	EndSpriteCombine();
0 comments (0 inline, 0 general)