Various fixes or adjustments

feature/pre-code-move
kaetemi 5 years ago committed by Jan Boon
parent 2cdfc0ce29
commit ae68ce722e

@ -106,7 +106,8 @@ public:
class ITexture : public CBitmap, public NLMISC::CRefCount, public NLMISC::IStreamable class ITexture : public CBitmap, public NLMISC::CRefCount, public NLMISC::IStreamable
{ {
public: public:
// NL_USES_DEFAULT_ARENA_OBJECT_ALLOCATOR // for fast alloc // TODO: FIX: NL_USES_DEFAULT_ARENA_OBJECT_ALLOCATOR // for fast alloc
// Those enums MUST be the same than in UTexture!! // Those enums MUST be the same than in UTexture!!
enum TWrapMode enum TWrapMode
{ {

@ -1261,7 +1261,7 @@ CObject* CComLuaModule::getObjectFromLua(lua_State* state, sint idx)
case LUA_TBOOLEAN: case LUA_TBOOLEAN:
{ {
double value = static_cast<double>(lua_toboolean(state, -1)); sint64 value = lua_toboolean(state, -1);
lua_pop(state, 1); lua_pop(state, 1);
return new CObjectNumber(value); return new CObjectNumber(value);
} }

@ -760,7 +760,7 @@ void CObjectRefId::doSerialize(std::string& out, CSerializeContext& /* context
CObjectNumber::CObjectNumber(double value) : CObject(), m_IsInteger(false) CObjectNumber::CObjectNumber(double value) : CObject(), m_IsInteger(false)
{ {
m_Value.Integer = value; m_Value.Number = value;
} }
CObjectNumber::CObjectNumber(sint64 value) : CObject(), m_IsInteger(true) CObjectNumber::CObjectNumber(sint64 value) : CObject(), m_IsInteger(true)

Loading…
Cancel
Save