Differential D2055 Diff 8774 source/tools/atlas/GameInterface/Handlers/TerrainHandlers.cpp

Changeset View

Standalone View

source/tools/atlas/GameInterface/Handlers/TerrainHandlers.cpp

	/* Copyright (C) 2012 Wildfire Games.			/* Copyright (C) 2019 Wildfire Games.
	* This file is part of 0 A.D.			* This file is part of 0 A.D.
	*			*
	* 0 A.D. is free software: you can redistribute it and/or modify			* 0 A.D. is free software: you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by			* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation, either version 2 of the License, or			* the Free Software Foundation, either version 2 of the License, or
	* (at your option) any later version.			* (at your option) any later version.
	*			*
	* 0 A.D. is distributed in the hope that it will be useful,			* 0 A.D. is distributed in the hope that it will be useful,
	▲ Show 20 Lines • Show All 160 Lines • ▼ Show 20 Lines
	{			{
	CTerrainTextureEntry* tex = g_TexMan.FindTexture(CStrW(*msg->name).ToUTF8());			CTerrainTextureEntry* tex = g_TexMan.FindTexture(CStrW(*msg->name).ToUTF8());
	if (tex)			if (tex)
	{			{
	msg->preview = GetPreview(tex, msg->imageWidth, msg->imageHeight);			msg->preview = GetPreview(tex, msg->imageWidth, msg->imageHeight);
	}			}
	else			else
	{			{
	sTerrainTexturePreview noPreview;			sTerrainTexturePreview noPreview {};
				elexisAuthorUnsubmitted Done Inline Actions above line is the important warning muting one, the one below for consistency elexis: above line is the important warning muting one, the one below for consistency
				vladislavbelovUnsubmitted Not Done Inline Actions Why space before `{`? vladislavbelov: Why space before `{`?
	noPreview.name = std::wstring();			noPreview.name = std::wstring();
				noPreview.loaded = false;
				vladislavbelovUnsubmitted Not Done Inline Actions Btw, it seems redundant since we don't initialise the `std::vector`, but it doesn't matter at the moment. vladislavbelov: Btw, it seems redundant since we don't initialise the `std::vector`, but it doesn't matter at…
				elexisAuthorUnsubmitted Done Inline Actions yes, I thought it might be a little bit more explicit, for the reader to be aware that these members must be taken care of. can also implement a ctor I guess if we want more explicitness. elexis: yes, I thought it might be a little bit more explicit, for the reader to be aware that these…
	noPreview.imageHeight = 0;			noPreview.imageHeight = 0;
	noPreview.imageWidth = 0;			noPreview.imageWidth = 0;
	msg->preview = noPreview;			msg->preview = noPreview;
	}			}
	}			}

	//////////////////////////////////////////////////////////////////////////			//////////////////////////////////////////////////////////////////////////

	▲ Show 20 Lines • Show All 361 Lines • Show Last 20 Lines