diff --git a/SDK/src/NDK/Lua/LuaBinding_Graphics.cpp b/SDK/src/NDK/Lua/LuaBinding_Graphics.cpp index 37d18bf5f..1dcf6ef0d 100644 --- a/SDK/src/NDK/Lua/LuaBinding_Graphics.cpp +++ b/SDK/src/NDK/Lua/LuaBinding_Graphics.cpp @@ -322,17 +322,17 @@ namespace Ndk if (lua.IsOfType(argIndex, Nz::LuaType_Number)) { std::size_t matIndex(lua.Check(&argIndex)); - Nz::MaterialRef material(lua.Check(&argIndex)); + Nz::MaterialRef mat(lua.Check(&argIndex)); - instance->SetMaterial(matIndex, std::move(material)); + instance->SetMaterial(matIndex, std::move(mat)); return 0; } else if (lua.IsOfType(argIndex, Nz::LuaType_String)) { Nz::String subMesh(lua.Check(&argIndex)); - Nz::MaterialRef material(lua.Check(&argIndex)); + Nz::MaterialRef mat(lua.Check(&argIndex)); - instance->SetMaterial(subMesh, std::move(material)); + instance->SetMaterial(subMesh, std::move(mat)); return 0; } @@ -346,9 +346,9 @@ namespace Ndk { std::size_t skinIndex(lua.Check(&argIndex)); std::size_t matIndex(lua.Check(&argIndex)); - Nz::MaterialRef material(lua.Check(&argIndex)); + Nz::MaterialRef mat(lua.Check(&argIndex)); - instance->SetMaterial(skinIndex, matIndex, std::move(material)); + instance->SetMaterial(skinIndex, matIndex, std::move(mat)); return 0; } else if (lua.IsOfType(argIndex, Nz::LuaType_String)) diff --git a/include/Nazara/Graphics/Billboard.inl b/include/Nazara/Graphics/Billboard.inl index e77d7dac9..6bbf9b143 100644 --- a/include/Nazara/Graphics/Billboard.inl +++ b/include/Nazara/Graphics/Billboard.inl @@ -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()))); } diff --git a/include/Nazara/Graphics/Sprite.inl b/include/Nazara/Graphics/Sprite.inl index e78434a78..9759c8a39 100644 --- a/include/Nazara/Graphics/Sprite.inl +++ b/include/Nazara/Graphics/Sprite.inl @@ -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()))); } diff --git a/include/Nazara/Network/ENetHost.hpp b/include/Nazara/Network/ENetHost.hpp index 39d6134a3..44d7180e4 100644 --- a/include/Nazara/Network/ENetHost.hpp +++ b/include/Nazara/Network/ENetHost.hpp @@ -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();