sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation warnings

This commit is contained in:
Lynix 2017-09-30 14:54:08 +02:00
parent 0fa3565435
commit fb354b1204
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SDK/include/NDK/BaseSystem.inl
View File

@ -35,9 +35,9 @@ namespace Ndk
m_requiredComponents(system.m_requiredComponents), m_requiredComponents(system.m_requiredComponents),
m_systemIndex(system.m_systemIndex), m_systemIndex(system.m_systemIndex),
m_updateEnabled(system.m_updateEnabled), m_updateEnabled(system.m_updateEnabled),
m_updateCounter(0.f),
m_fixedUpdateRate(system.m_fixedUpdateRate), m_fixedUpdateRate(system.m_fixedUpdateRate),
m_maxUpdateRate(system.m_maxUpdateRate), m_maxUpdateRate(system.m_maxUpdateRate),
m_updateCounter(0.f),
m_updateOrder(system.m_updateOrder) m_updateOrder(system.m_updateOrder)
{ {
} }

18
SDK/src/NDK/Lua/LuaBinding_Core.cpp
View File

@ -32,28 +32,28 @@ namespace Ndk
stream.BindMethod("IsWritable", &Nz::Stream::IsWritable); stream.BindMethod("IsWritable", &Nz::Stream::IsWritable);
stream.BindMethod("SetCursorPos", &Nz::Stream::SetCursorPos); stream.BindMethod("SetCursorPos", &Nz::Stream::SetCursorPos);
stream.BindMethod("Read", [] (Nz::LuaState& lua, Nz::Stream& stream, std::size_t /*argumentCount*/) -> int { stream.BindMethod("Read", [] (Nz::LuaState& lua, Nz::Stream& instance, std::size_t /*argumentCount*/) -> int {
int argIndex = 2; int argIndex = 2;
std::size_t length = lua.Check<std::size_t>(&argIndex); std::size_t length = lua.Check<std::size_t>(&argIndex);
std::unique_ptr<char[]> buffer(new char[length]); std::unique_ptr<char[]> buffer(new char[length]);
std::size_t readLength = stream.Read(buffer.get(), length); std::size_t readLength = instance.Read(buffer.get(), length);
lua.PushString(Nz::String(buffer.get(), readLength)); lua.PushString(Nz::String(buffer.get(), readLength));
return 1; return 1;
}); });
stream.BindMethod("Write", [] (Nz::LuaState& lua, Nz::Stream& stream, std::size_t /*argumentCount*/) -> int { stream.BindMethod("Write", [] (Nz::LuaState& lua, Nz::Stream& instance, std::size_t /*argumentCount*/) -> int {
int argIndex = 2; int argIndex = 2;
std::size_t bufferSize = 0; std::size_t bufferSize = 0;
const char* buffer = lua.CheckString(argIndex, &bufferSize); const char* buffer = lua.CheckString(argIndex, &bufferSize);
if (stream.IsTextModeEnabled()) if (instance.IsTextModeEnabled())
lua.Push(stream.Write(Nz::String(buffer, bufferSize))); lua.Push(instance.Write(Nz::String(buffer, bufferSize)));
else else
lua.Push(stream.Write(buffer, bufferSize)); lua.Push(instance.Write(buffer, bufferSize));
return 1; return 1;
}); });
} }
@ -103,11 +103,11 @@ namespace Ndk
clock.BindMethod("Unpause", &Nz::Clock::Unpause); clock.BindMethod("Unpause", &Nz::Clock::Unpause);
// Manual // Manual
clock.BindMethod("__tostring", [] (Nz::LuaState& lua, Nz::Clock& clock, std::size_t /*argumentCount*/) -> int { clock.BindMethod("__tostring", [] (Nz::LuaState& lua, Nz::Clock& instance, std::size_t /*argumentCount*/) -> int {
Nz::StringStream ss("Clock(Elapsed: "); Nz::StringStream ss("Clock(Elapsed: ");
ss << clock.GetSeconds(); ss << instance.GetSeconds();
ss << "s, Paused: "; ss << "s, Paused: ";
ss << clock.IsPaused(); ss << instance.IsPaused();
ss << ')'; ss << ')';
lua.PushString(ss); lua.PushString(ss);