Merge branch 'master' into physics3d-material

This commit is contained in:
Lynix
2018-01-20 14:21:01 +01:00
10 changed files with 96 additions and 18 deletions

View File

@@ -22,8 +22,8 @@
SOFTWARE.
*/
#ifndef NDK_PREREQUESITES_HPP
#define NDK_PREREQUESITES_HPP
#ifndef NDK_PREREQUISITES_HPP
#define NDK_PREREQUISITES_HPP
/*!
* \defgroup NDK (NazaraSDK) Nazara Development Kit
@@ -51,4 +51,4 @@ namespace Ndk
using SystemIndex = Nz::UInt32;
}
#endif // NDK_PREREQUESITES_HPP
#endif // NDK_PREREQUISITES_HPP

View File

@@ -13,7 +13,8 @@ namespace Ndk
* \param addDefaultSystems Should default provided systems be used
*/
inline World::World(bool addDefaultSystems)
inline World::World(bool addDefaultSystems) :
m_orderedSystemsUpdated(false)
{
if (addDefaultSystems)
AddDefaultSystems();

View File

@@ -165,6 +165,7 @@ namespace Ndk
consoleRef.AddLine(str);
});
overlay->lua.LoadLibraries();
LuaAPI::RegisterClasses(overlay->lua);
// Override "print" function to add a line in the console