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

Lua/LuaInstance: Fix LuaImplReplyVal for enum flags

Browse Source
This commit is contained in:
Lynix
2016-11-27 14:26:39 +01:00
parent 0031b0fd83
commit 71408d7c3b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/Nazara/Lua/LuaInstance.inl
View File

@@ -122,7 +122,7 @@ namespace Nz
unsigned int ret = LuaImplQueryArg(instance, index, &pot2Val, TypeTag<UnderlyingT>()); unsigned int ret = LuaImplQueryArg(instance, index, &pot2Val, TypeTag<UnderlyingT>());
*arg = static_cast<T>(IntegralLog2Pot(pot2Val)); *arg = static_cast<T>(IntegralLog2Pot(pot2Val));
return 1; return ret;
} }
template<typename T> template<typename T>
@@ -134,7 +134,7 @@ namespace Nz
unsigned int ret = LuaImplQueryArg(instance, index, &pot2Val, 1U << static_cast<UnderlyingT>(defValue), TypeTag<UnderlyingT>()); unsigned int ret = LuaImplQueryArg(instance, index, &pot2Val, 1U << static_cast<UnderlyingT>(defValue), TypeTag<UnderlyingT>());
*arg = static_cast<T>(IntegralLog2Pot(pot2Val)); *arg = static_cast<T>(IntegralLog2Pot(pot2Val));
return 1; return ret;
} }
template<typename E> template<typename E>
@@ -232,8 +232,8 @@ namespace Nz
template<typename E> template<typename E>
int LuaImplReplyVal(const LuaInstance& instance, Flags<E> val, TypeTag<Flags<E>>) int LuaImplReplyVal(const LuaInstance& instance, Flags<E> val, TypeTag<Flags<E>>)
{ {
UInt32 bitField(val); instance.PushInteger(UInt32(val));
return LuaImplReplyVal(instance, bitField, TypeTag<decltype(bitField)>()); return 1;
} }
template<typename T> template<typename T>