Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #900 ELuaExecuteError: No matching overload found, setContextHelpText

Browse source
This commit is contained in:
kervala 2010-05-18 19:24:01 +02:00
parent d5551d5aa9
commit e45b1e9461
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
code/ryzom/client/src/interface_v3/lua_ihm.cpp
View file

@ -649,20 +649,22 @@ void CLuaIHM::luaValueFromReflectedProperty(CLuaState &ls, CReflectable &reflect
break; break;
case CReflectedProperty::UCString: case CReflectedProperty::UCString:
{ {
ucstring str = (reflectedObject.*(property.GetMethod.GetUCString))();
#if LUABIND_VERSION > 600 #if LUABIND_VERSION > 600
luabind::detail::push(ls.getStatePointer(), (reflectedObject.*(property.GetMethod.GetUCString))() ); luabind::detail::push(ls.getStatePointer(), str);
#else #else
luabind::object obj(ls.getStatePointer(), (reflectedObject.*(property.GetMethod.GetUCString))() ); luabind::object obj(ls.getStatePointer(), str);
obj.pushvalue(); obj.pushvalue();
#endif #endif
} }
break; break;
case CReflectedProperty::RGBA: case CReflectedProperty::RGBA:
{ {
CRGBA color = (reflectedObject.*(property.GetMethod.GetRGBA))();
#if LUABIND_VERSION > 600 #if LUABIND_VERSION > 600
luabind::detail::push(ls.getStatePointer(), (reflectedObject.*(property.GetMethod.GetRGBA))() ); luabind::detail::push(ls.getStatePointer(), color);
#else #else
luabind::object obj(ls.getStatePointer(), (reflectedObject.*(property.GetMethod.GetRGBA))()); luabind::object obj(ls.getStatePointer(), color);
obj.pushvalue(); obj.pushvalue();
#endif #endif
} }
@ -1137,17 +1139,17 @@ int CLuaIHM::getClientCfgVar(CLuaState &ls)
ls.newTable(); ls.newTable();
CLuaObject result(ls); CLuaObject result(ls);
uint count = 0; uint count = 0;
for(uint i = 0; (sint)i<v->StrValues.size(); i++) for(uint i = 0; i<v->StrValues.size(); i++)
{ {
result.setValue(toString(count).c_str(), v->StrValues[i]); result.setValue(toString(count).c_str(), v->StrValues[i]);
count++; count++;
} }
for(uint i = 0; (sint)i<v->IntValues.size(); i++) for(uint i = 0; i<v->IntValues.size(); i++)
{ {
result.setValue(toString(count).c_str(), (double)v->IntValues[i]); result.setValue(toString(count).c_str(), (double)v->IntValues[i]);
count++; count++;
} }
for(uint i = 0; (sint)i<v->RealValues.size(); i++) for(uint i = 0; i<v->RealValues.size(); i++)
{ {
result.setValue(toString(count).c_str(), (double)v->RealValues[i]); result.setValue(toString(count).c_str(), (double)v->RealValues[i]);
count++; count++;
@ -2000,7 +2002,7 @@ void CLuaIHM::unpauseBGDownloader()
// *************************************************************************** // ***************************************************************************
void CLuaIHM::requestBGDownloaderPriority(uint priority) void CLuaIHM::requestBGDownloaderPriority(uint priority)
{ {
if (priority < 0 || priority >= BGDownloader::ThreadPriority_Count) if (priority >= BGDownloader::ThreadPriority_Count)
{ {
throw NLMISC::Exception("requestBGDownloaderPriority() : invalid priority"); throw NLMISC::Exception("requestBGDownloaderPriority() : invalid priority");
} }
@ -2689,10 +2691,11 @@ int CLuaIHM::runExprAndPushResult(CLuaState &ls, const std::string &expr)
} }
case CInterfaceExprValue::RGBA: case CInterfaceExprValue::RGBA:
{ {
CRGBA color = value.getRGBA();
#if LUABIND_VERSION > 600 #if LUABIND_VERSION > 600
luabind::detail::push(ls.getStatePointer(), value.getRGBA()); luabind::detail::push(ls.getStatePointer(), color);
#else #else
luabind::object obj(ls.getStatePointer(), value.getRGBA()); luabind::object obj(ls.getStatePointer(), color);
obj.pushvalue(); obj.pushvalue();
#endif #endif
break; break;