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

Fix some errors 

Former-commit-id: df7db9ab69395ca969779817fcdc17acb711967d
This commit is contained in:
Lynix 2016-04-24 04:38:18 +02:00
parent d1e12a6d2e
commit b5f237b58f
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SDK/include/NDK/LuaAPI.inl
View File

@ -8,6 +8,8 @@
#include <Nazara/Math/Quaternion.hpp> #include <Nazara/Math/Quaternion.hpp>
#include <Nazara/Math/Vector3.hpp> #include <Nazara/Math/Vector3.hpp>
#include <Nazara/Network/IpAddress.hpp> #include <Nazara/Network/IpAddress.hpp>
#include <Nazara/Utility/Font.hpp>
#include <Nazara/Utility/Mesh.hpp>
#include <NDK/Application.hpp> #include <NDK/Application.hpp>
#include <NDK/Components.hpp> #include <NDK/Components.hpp>
#include <NDK/Entity.hpp> #include <NDK/Entity.hpp>
@ -67,7 +69,7 @@ namespace Nz
inline unsigned int LuaImplQueryArg(const LuaInstance& instance, int index, FontRef* fontRef, TypeTag<FontRef>) inline unsigned int LuaImplQueryArg(const LuaInstance& instance, int index, FontRef* fontRef, TypeTag<FontRef>)
{ {
*fontRef = *(*static_cast<FontRef**>(instance.CheckUserdata(index, "Font"))); *fontRef = *(*static_cast<FontRef**>(instance.CheckUserdata(index, "Font")));
return 1; return 1;
} }

9
src/Nazara/Utility/Font.cpp
View File

@ -359,13 +359,10 @@ namespace Nz
if (!s_defaultFont) if (!s_defaultFont)
{ {
FontRef cabin = Font::New(); FontRef cabin = Font::New();
if (!cabin->OpenFromMemory(r_cabinRegular, sizeof(r_cabinRegular))) if (cabin->OpenFromMemory(r_cabinRegular, sizeof(r_cabinRegular)))
{ s_defaultFont = cabin;
else
NazaraError("Failed to open default font"); NazaraError("Failed to open default font");
return nullptr;
}
s_defaultFont = cabin;
} }
return s_defaultFont; return s_defaultFont;