aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-10 09:19:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-01-11 11:44:44 +01:00
commit 6471fada97
3 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -30,7 +30,7 @@ script:
- cmake --build build -- -j 2 - cmake --build build -- -j 2
notifications: notifications:
irc: "chat.freenode.net#ryzomforge" irc: "chat.freenode.net#ryzom"
template: template:
- "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}" - "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}"
- "Description : %{commit_message}" - "Description : %{commit_message}"

2
code/nel/src/gui/group_html.cpp
View file

@ -5177,7 +5177,7 @@ namespace NLGUI
{ {
if (!it.nextKey().isInteger()) if (!it.nextKey().isInteger())
{ {
nlwarning("%s : bad key encountered with type %s, number expected.", funcName, it.nextKey().getTypename()); nlwarning("%s : bad key encountered with type %s, integer expected.", funcName, it.nextKey().getTypename());
continue; continue;
} }
if (!it.nextValue().isString()) if (!it.nextValue().isString())

8
code/nel/src/gui/lua_ihm.cpp
View file

@ -231,10 +231,6 @@ namespace NLGUI
} }
#if LUA_VERSION_NUM < 503
#define lua_isinteger(a, b) lua_isnumber(a, b)
#endif
// *************************************************************************** // ***************************************************************************
#define LUA_REGISTER_BASIC(_type_) \ #define LUA_REGISTER_BASIC(_type_) \
luabind::detail::yes_t is_user_defined(luabind::detail::by_value<_type_>); \ luabind::detail::yes_t is_user_defined(luabind::detail::by_value<_type_>); \
@ -244,11 +240,11 @@ namespace NLGUI
} \ } \
int match_lua_to_cpp(lua_State* L, luabind::detail::by_value<_type_>, int index) \ int match_lua_to_cpp(lua_State* L, luabind::detail::by_value<_type_>, int index) \
{ \ { \
if (lua_isinteger(L, index)) return 0; else return -1; \ return lua_isnumber(L, index) ? 0:-1; \
} \ } \
void convert_cpp_to_lua(lua_State* L, const _type_& v) \ void convert_cpp_to_lua(lua_State* L, const _type_& v) \
{ \ { \
lua_pushinteger(L, (double)v); \ lua_pushinteger(L, (lua_Integer)v); \
} }
// Basic LUA types // Basic LUA types