From 1b7db1e92d7d72aea349d964fd6e8a6e94e104b0 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Mon, 11 Jan 2016 11:44:44 +0100
Subject: [PATCH] Merge with develop

---
 .travis.yml                     |  2 +-
 code/nel/src/gui/group_html.cpp |  2 +-
 code/nel/src/gui/lua_ihm.cpp    | 16 ++++++----------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f475c1eaf..7de399206 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ script:
     - cmake --build build -- -j 2
 
 notifications:
-  irc: "chat.freenode.net#ryzomforge"
+  irc: "chat.freenode.net#ryzom"
     template:
       - "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}"
       - "Description : %{commit_message}"
diff --git a/code/nel/src/gui/group_html.cpp b/code/nel/src/gui/group_html.cpp
index 40dead326..bac9ef867 100644
--- a/code/nel/src/gui/group_html.cpp
+++ b/code/nel/src/gui/group_html.cpp
@@ -5177,7 +5177,7 @@ namespace NLGUI
 		{
 			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;
 			}
 			if (!it.nextValue().isString())
diff --git a/code/nel/src/gui/lua_ihm.cpp b/code/nel/src/gui/lua_ihm.cpp
index b409de661..d55bda42d 100644
--- a/code/nel/src/gui/lua_ihm.cpp
+++ b/code/nel/src/gui/lua_ihm.cpp
@@ -231,24 +231,20 @@ namespace NLGUI
 
 }
 
-#if LUA_VERSION_NUM < 503
-#define lua_isinteger(a, b) lua_isnumber(a, b)
-#endif
-
 	// ***************************************************************************
 	#define LUA_REGISTER_BASIC(_type_)															\
 	luabind::detail::yes_t is_user_defined(luabind::detail::by_value<_type_>);					\
-	_type_ convert_lua_to_cpp(lua_State* L,    luabind::detail::by_value<_type_>,    int index)	\
+	_type_ convert_lua_to_cpp(lua_State* L, luabind::detail::by_value<_type_>, int index)		\
 	{																							\
-		return (_type_)lua_tointeger(L,    index);												\
+		return (_type_)lua_tointeger(L, index);													\
 	}																							\
-	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