Fix some warnings

This commit is contained in:
Lynix
2017-10-18 22:02:21 +02:00
parent b47b89ed8b
commit be38aee1fa
4 changed files with 11 additions and 11 deletions

View File

@@ -146,9 +146,9 @@ namespace Nz
if (resizeBillboard)
{
if (const MaterialRef& material = GetMaterial())
if (const MaterialRef& newMat = GetMaterial())
{
const TextureRef& diffuseMap = material->GetDiffuseMap();
const TextureRef& diffuseMap = newMat->GetDiffuseMap();
if (diffuseMap && diffuseMap->IsValid())
SetSize(Vector2f(Vector2ui(diffuseMap->GetSize())));
}

View File

@@ -200,9 +200,9 @@ namespace Nz
if (resizeSprite)
{
if (const MaterialRef& material = GetMaterial())
if (const MaterialRef& newMat = GetMaterial())
{
const TextureRef& diffuseMap = material->GetDiffuseMap();
const TextureRef& diffuseMap = newMat->GetDiffuseMap();
if (diffuseMap && diffuseMap->IsValid())
SetSize(Vector2f(Vector2ui(diffuseMap->GetSize())));
}

View File

@@ -53,7 +53,7 @@ namespace Nz
inline bool Create(NetProtocol protocol, UInt16 port, std::size_t peerCount, std::size_t channelCount = 0);
bool Create(const IpAddress& listenAddress, std::size_t peerCount, std::size_t channelCount = 0);
bool Create(const IpAddress& listenAddress, std::size_t peerCount, std::size_t channelCount, UInt32 incomingBandwidth, UInt32 outgoingBandwidth);
void Destroy();
inline void Destroy();
void Flush();