From 1e8d28759ab31d858dc379cd371e2e7f799688da Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 18 Dec 2016 20:44:33 +0100 Subject: [PATCH] Merge with develop --- code/nel/CMakeLists.txt | 3 - code/nel/src/georges/form.cpp | 2 +- code/nel/src/georges/form_loader.cpp | 10 +- code/nel/src/gui/group_menu.cpp | 4 +- code/nel/src/gui/view_pointer_base.cpp | 10 +- code/nel/src/net/unified_network.cpp | 11 +- .../gamedev/interfaces_v3/webig_widgets.xml | 2 +- code/ryzom/client/src/cursor_functions.cpp | 2 +- code/ryzom/client/src/entities.cpp | 17 +- code/ryzom/client/src/input.cpp | 4 +- .../src/interface_v3/action_handler_game.cpp | 3 +- .../client/src/interface_v3/lua_ihm_ryzom.cpp | 436 ++++++++++-------- .../client/src/interface_v3/lua_ihm_ryzom.h | 2 +- code/ryzom/client/src/r2/tool.cpp | 12 +- code/ryzom/client/src/r2/tool.h | 3 +- code/ryzom/client/src/r2/tool_choose_pos.cpp | 8 +- .../client/src/r2/tool_create_entity.cpp | 2 +- 17 files changed, 291 insertions(+), 240 deletions(-) diff --git a/code/nel/CMakeLists.txt b/code/nel/CMakeLists.txt index 0f1d11579..84b820d33 100644 --- a/code/nel/CMakeLists.txt +++ b/code/nel/CMakeLists.txt @@ -1,5 +1,3 @@ -PROJECT(NeL CXX C) - IF(WITH_STATIC_DRIVERS) ADD_DEFINITIONS(-DNL_STATIC) ENDIF() @@ -17,7 +15,6 @@ IF(WITH_3D) IF(WITH_NEL_CEGUI) FIND_PACKAGE(CEGUI) ENDIF() - ENDIF() IF(WITH_SOUND) diff --git a/code/nel/src/georges/form.cpp b/code/nel/src/georges/form.cpp index 6ec949078..07f4c2adf 100644 --- a/code/nel/src/georges/form.cpp +++ b/code/nel/src/georges/form.cpp @@ -289,7 +289,7 @@ bool CForm::insertParent (uint before, const std::string &filename, CForm *paren else { // Output an error - warning (false, "insertParent", "Can't insert parent form (%s) that has not the same DFN.", filename); + warning (false, "insertParent", "Can't insert parent form (%s) that has not the same DFN.", filename.c_str()); } return false; diff --git a/code/nel/src/georges/form_loader.cpp b/code/nel/src/georges/form_loader.cpp index 154fb9e0d..b56ed23ef 100644 --- a/code/nel/src/georges/form_loader.cpp +++ b/code/nel/src/georges/form_loader.cpp @@ -171,7 +171,7 @@ CFormDfn *CFormLoader::loadFormDfn (const std::string &filename, bool forceLoad) else { // Output error - warning (false, "loadFormDfn", "Can't open the form file (%s).", filename); + warning (false, "loadFormDfn", "Can't open the form file (%s).", filename.c_str()); // Delete the formDfn delete formDfn; @@ -182,7 +182,7 @@ CFormDfn *CFormLoader::loadFormDfn (const std::string &filename, bool forceLoad) catch (const Exception &e) { // Output error - warning (false, "loadFormDfn", "Error while loading the form (%s): %s", filename, e.what()); + warning (false, "loadFormDfn", "Error while loading the form (%s): %s", filename.c_str(), e.what()); // Delete the formDfn delete formDfn; @@ -257,7 +257,7 @@ UForm *CFormLoader::loadForm (const std::string &filename) else { // Output error - warning (false, "loadForm", "Can't open the form file (%s).", filename); + warning (false, "loadForm", "Can't open the form file (%s).", filename.c_str()); // Delete the form delete form; @@ -279,7 +279,7 @@ UForm *CFormLoader::loadForm (const std::string &filename) catch (const Exception &e) { // Output error - warning (false, "loadForm", "Error while loading the form (%s): %s", filename, e.what()); + warning (false, "loadForm", "Error while loading the form (%s): %s", filename.c_str(), e.what()); // Delete the form delete form; @@ -317,7 +317,7 @@ void CFormLoader::warning (bool exception, const std::string &function, const ch va_end( args ); // Set the warning - NLGEORGES::warning (exception, "(CFormLoader::%s) : %s", function, buffer); + NLGEORGES::warning (exception, "(CFormLoader::%s) : %s", function.c_str(), buffer); } // *************************************************************************** diff --git a/code/nel/src/gui/group_menu.cpp b/code/nel/src/gui/group_menu.cpp index 409921faf..97d45c870 100644 --- a/code/nel/src/gui/group_menu.cpp +++ b/code/nel/src/gui/group_menu.cpp @@ -1800,7 +1800,7 @@ namespace NLGUI addLine(arg1, ls.toString(2), ls.toString(3), ls.toString(4)); return 0; } - + // ------------------------------------------------------------------------------------------------ int CGroupSubMenu::luaAddIconLine(CLuaState &ls) { @@ -1816,7 +1816,7 @@ namespace NLGUI addLine(arg1, ls.toString(2), ls.toString(3), ls.toString(4), string(), ls.toString(5)); return 0; } - + // ------------------------------------------------------------------------------------------------ int CGroupSubMenu::luaAddLineAtIndex(CLuaState &ls) { diff --git a/code/nel/src/gui/view_pointer_base.cpp b/code/nel/src/gui/view_pointer_base.cpp index 85b7a3baf..9589afd9c 100644 --- a/code/nel/src/gui/view_pointer_base.cpp +++ b/code/nel/src/gui/view_pointer_base.cpp @@ -100,8 +100,8 @@ namespace NLGUI _PointerMiddleDownY = _PointerY; } } - - // -------------------------------------------------------------------------------------------------------------------- + + // -------------------------------------------------------------------------------------------------------------------- void CViewPointerBase::setPointerRightDown (bool pd) { _PointerRightDown = pd; @@ -147,7 +147,7 @@ namespace NLGUI { x = _PointerDownX; y = _PointerDownY; - + return _PointerDown; } @@ -156,7 +156,7 @@ namespace NLGUI { x = _PointerMiddleDownX; y = _PointerMiddleDownY; - + return _PointerMiddleDown; } @@ -165,7 +165,7 @@ namespace NLGUI { x = _PointerRightDownX; y = _PointerRightDownY; - + return _PointerRightDown; } diff --git a/code/nel/src/net/unified_network.cpp b/code/nel/src/net/unified_network.cpp index ee882f547..3a57b4b0d 100644 --- a/code/nel/src/net/unified_network.cpp +++ b/code/nel/src/net/unified_network.cpp @@ -828,17 +828,18 @@ void CUnifiedNetwork::addService(const string &name, const vector for (uint i = 0; i < addr.size(); i++) { // first we have to look if we have a network that can established the connection - + uint j = 0; + // it's loopback ip address, it's ok if (!addr[i].isLoopbackIPAddress()) { - // it's loopback ip address, it's ok for (j = 0; j < laddr.size (); j++) { if (laddr[j].internalNetAddress () == addr[i].internalNetAddress ()) { - break; // it's ok, we can try + // it's ok, we can try + break; } } @@ -1272,7 +1273,8 @@ uint8 CUnifiedNetwork::findConnectionId (TServiceId sid, uint8 nid) uint8 connectionId = _IdCnx[sid.get()].DefaultNetwork; if (nid == 0xFF) - { // default network + { + // default network //nldebug ("HNETL5: nid %hu, will use the default connection %hu", (uint16)nid, (uint16)connectionId); } else if (nid >= _IdCnx[sid.get()].NetworkConnectionAssociations.size()) @@ -1293,7 +1295,6 @@ uint8 CUnifiedNetwork::findConnectionId (TServiceId sid, uint8 nid) if (connectionId >= _IdCnx[sid.get()].Connections.size() || !_IdCnx[sid.get()].Connections[connectionId].valid() || !_IdCnx[sid.get()].Connections[connectionId].CbNetBase->connected()) { - if (nid != 0xFF) { // not a default network. There's a problem with the selected connectionID, so try to find a valid one diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/webig_widgets.xml b/code/ryzom/client/data/gamedev/interfaces_v3/webig_widgets.xml index e69ebe8a1..9392c94fe 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/webig_widgets.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/webig_widgets.xml @@ -6,7 +6,7 @@ - +