diff --git a/code/nel/include/nel/gui/group_html.h b/code/nel/include/nel/gui/group_html.h index f52132fad..98532abe4 100644 --- a/code/nel/include/nel/gui/group_html.h +++ b/code/nel/include/nel/gui/group_html.h @@ -457,7 +457,7 @@ namespace NLGUI } std::vector _FontOblique; - inline uint getFontOblique() const + inline bool getFontOblique() const { if (_FontOblique.empty()) return false; @@ -465,7 +465,7 @@ namespace NLGUI } std::vector _FontUnderlined; - inline uint getFontUnderlined() const + inline bool getFontUnderlined() const { if (_FontUnderlined.empty()) return false; @@ -473,7 +473,7 @@ namespace NLGUI } std::vector _FontStrikeThrough; - inline uint getFontStrikeThrough() const + inline bool getFontStrikeThrough() const { if (_FontStrikeThrough.empty()) return false; diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt index ac32bcbf5..b9747eb0f 100644 --- a/code/ryzom/client/src/CMakeLists.txt +++ b/code/ryzom/client/src/CMakeLists.txt @@ -88,7 +88,6 @@ INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR} ${LUA_INCLUDE_DIR} ${LUABIND_INCLUDE_DIR} - ${LIBWWW_INCLUDE_DIR} ${CURL_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ) @@ -108,7 +107,6 @@ TARGET_LINK_LIBRARIES(ryzom_client ${LUA_LIBRARIES} ${LUABIND_LIBRARIES} ${CURL_LIBRARIES} - ${LIBWWW_LIBRARIES} ${SEVENZIP_LIBRARY} ) diff --git a/code/ryzom/client/src/character_cl.cpp b/code/ryzom/client/src/character_cl.cpp index 89c9b805b..f4892eb70 100644 --- a/code/ryzom/client/src/character_cl.cpp +++ b/code/ryzom/client/src/character_cl.cpp @@ -8369,7 +8369,7 @@ ADD_METHOD(void CCharacterCL::displayDebug(float x, float &y, float lineStep)) / // Display the Run Factor. TextContext->printfAt(x, y, "(Walk)Run Factor: %f", runFactor()); y += lineStep; - // Display the current animation name(id)(offset)(nbloop) pour le channel MOVE. + // Display the current animation name(id)(offset)(nbloop) for channel MOVE. TextContext->printfAt(x, y, "Current Animation: %s(%u)(%lf)(%u loops)", animId(MOVE)==std::numeric_limits::max()?"[NONE]":currentAnimationName().c_str(), animId(MOVE), animOffset(MOVE), _NbLoopAnim); y += lineStep; // First Pos @@ -8388,14 +8388,8 @@ ADD_METHOD(void CCharacterCL::displayDebug(float x, float &y, float lineStep)) / TextContext->printfAt(x, y, "Prim Pos: %f %f %f", primFinalPos.x, primFinalPos.y, primFinalPos.z); y += lineStep; } - // Skeleton Ptr - TextContext->printfAt(x, y, "Skel Ptr: %p", &_Skeleton); - y += lineStep; - // Animset Ptr - TextContext->printfAt(x, y, "AnimSet Ptr: %p", _CurrentAnimSet[MOVE]); - y += lineStep; - // Current State Ptr - TextContext->printfAt(x, y, "State Ptr: %p", _CurrentState); + // Skeleton Ptr, Animset Ptr and Current State Ptr + TextContext->printfAt(x, y, "Skel Ptr: %p - AnimSet Ptr: %p - State Ptr: %p", &_Skeleton, _CurrentAnimSet[MOVE], _CurrentState); y += lineStep; // Display the target mount and rider. TextContext->printfAt(x, y, "Mount: %3u(Theoretical: %3u) Rider: %3u(Theoretical: %3u)", mount(), _TheoreticalMount, rider(), _TheoreticalRider); diff --git a/code/ryzom/client/src/entity_cl.cpp b/code/ryzom/client/src/entity_cl.cpp index 6a14d6400..bee6b1d1d 100644 --- a/code/ryzom/client/src/entity_cl.cpp +++ b/code/ryzom/client/src/entity_cl.cpp @@ -2104,11 +2104,8 @@ void CEntityCL::setEntityName(const ucstring &name) //--------------------------------------------------- void CEntityCL::displayDebug(float x, float &y, float lineStep) // virtual { - // Type - TextContext->printfAt(x, y, "Type: %d", Type); - y += lineStep; - // Slot - TextContext->printfAt(x, y, "Slot: %d", _Slot); + // Type and slot + TextContext->printfAt(x, y, "Type: %d - Slot: %d", Type, _Slot); y += lineStep; // Outpost TextContext->printfAt(x, y, "Outpost id:%d side:%s",this->getOutpostId(),OUTPOSTENUMS::toString(this->getOutpostSide()).c_str() ); @@ -2119,11 +2116,8 @@ void CEntityCL::displayDebug(float x, float &y, float lineStep) // virtual else TextContext->printfAt(x, y, "Name not received"); y += lineStep; - // Target - TextContext->printfAt(x, y, "Target: %d", _TargetSlot); - y += lineStep; - // DataSet Id - TextContext->printfAt(x, y, "DataSet Id: %u", _DataSetId); + // Target and DataSet Id + TextContext->printfAt(x, y, "Target: %d - DataSet Id: %u", _TargetSlot, _DataSetId); y += lineStep; // Sheet Id TextContext->printfAt(x, y, "Sheet: %d(%s)", _SheetId.asInt(), _SheetId.toString().c_str()); diff --git a/code/ryzom/client/src/interface_v3/chat_displayer.h b/code/ryzom/client/src/interface_v3/chat_displayer.h index e2afc7207..5c46c81ca 100644 --- a/code/ryzom/client/src/interface_v3/chat_displayer.h +++ b/code/ryzom/client/src/interface_v3/chat_displayer.h @@ -25,11 +25,6 @@ #include "nel/misc/mutex.h" -// to fix a conflict with syslog.h being included by libwww -#ifdef LOG_WARNING -#undef LOG_WARNING -#endif - /** * class used to display console text commands in the chat window * \author Nicolas Brigand diff --git a/dist/debian/precise/debian/control b/dist/debian/precise/debian/control index cf8840bb2..e946c61ca 100644 --- a/dist/debian/precise/debian/control +++ b/dist/debian/precise/debian/control @@ -6,14 +6,14 @@ Build-Depends: debhelper (>= 9), cmake(>= 2.6), libxml2-dev, libgl1-mesa-dev, libjpeg8-dev | libjpeg62-dev, libpng12-dev, libopenal-dev, libfreetype6-dev, libxxf86vm-dev, libxrandr-dev, libxrender-dev, libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev, - libboost-dev, libwww-dev, libmysqlclient-dev, + libboost-dev, libmysqlclient-dev, libcpptest-dev, libqt4-dev, libqt4-opengl-dev Standards-Version: 3.9.3 Section: games -Bugs: http://dev.ryzom.com/projects/ryzom/issues -Homepage: http://dev.ryzom.com -Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/nel/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/nel/?op=log +Bugs: https://bitbucket.org/ryzom/ryzomcore/issues +Homepage: https://bitbucket.org/ryzom/ryzomcore/ +Vcs-Hg: https://bitbucket.org/ryzom/ryzomcore +Vcs-Browser: https://bitbucket.org/ryzom/ryzomcore Package: libnel0 Section: libdevel diff --git a/dist/debian/precise/debian/rules b/dist/debian/precise/debian/rules index 2b329f3be..26ace8254 100755 --- a/dist/debian/precise/debian/rules +++ b/dist/debian/precise/debian/rules @@ -12,7 +12,7 @@ override_dh_strip: dh_strip -pryzom-tools --dbg-package=ryzom-tools-dbg override_dh_auto_configure: - dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_QT=ON + dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_QT=ON override_dh_install: dh_install diff --git a/dist/debian/trusty/debian/control b/dist/debian/trusty/debian/control index e662d1f37..a802646d4 100644 --- a/dist/debian/trusty/debian/control +++ b/dist/debian/trusty/debian/control @@ -6,14 +6,14 @@ Build-Depends: debhelper (>= 9), cmake(>= 2.6), libxml2-dev, libgl1-mesa-dev, libjpeg8-dev | libjpeg62-dev, libpng12-dev, libopenal-dev, libfreetype6-dev, libxxf86vm-dev, libxrandr-dev, libxrender-dev, libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev, - libboost-dev, libwww-dev, libmysqlclient-dev, + libboost-dev, libmysqlclient-dev, libcpptest-dev, libqt4-dev, libqt4-opengl-dev Standards-Version: 3.9.5 Section: games -Bugs: http://dev.ryzom.com/projects/ryzom/issues -Homepage: http://dev.ryzom.com -Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/nel/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/nel/?op=log +Bugs: https://bitbucket.org/ryzom/ryzomcore/issues +Homepage: https://bitbucket.org/ryzom/ryzomcore/ +Vcs-Hg: https://bitbucket.org/ryzom/ryzomcore +Vcs-Browser: https://bitbucket.org/ryzom/ryzomcore Package: libnel0 Section: libdevel diff --git a/dist/debian/trusty/debian/rules b/dist/debian/trusty/debian/rules index 2b329f3be..26ace8254 100755 --- a/dist/debian/trusty/debian/rules +++ b/dist/debian/trusty/debian/rules @@ -12,7 +12,7 @@ override_dh_strip: dh_strip -pryzom-tools --dbg-package=ryzom-tools-dbg override_dh_auto_configure: - dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_QT=ON + dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_QT=ON override_dh_install: dh_install diff --git a/dist/debian/utopic/debian/control b/dist/debian/utopic/debian/control index e662d1f37..a802646d4 100644 --- a/dist/debian/utopic/debian/control +++ b/dist/debian/utopic/debian/control @@ -6,14 +6,14 @@ Build-Depends: debhelper (>= 9), cmake(>= 2.6), libxml2-dev, libgl1-mesa-dev, libjpeg8-dev | libjpeg62-dev, libpng12-dev, libopenal-dev, libfreetype6-dev, libxxf86vm-dev, libxrandr-dev, libxrender-dev, libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev, - libboost-dev, libwww-dev, libmysqlclient-dev, + libboost-dev, libmysqlclient-dev, libcpptest-dev, libqt4-dev, libqt4-opengl-dev Standards-Version: 3.9.5 Section: games -Bugs: http://dev.ryzom.com/projects/ryzom/issues -Homepage: http://dev.ryzom.com -Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/nel/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/nel/?op=log +Bugs: https://bitbucket.org/ryzom/ryzomcore/issues +Homepage: https://bitbucket.org/ryzom/ryzomcore/ +Vcs-Hg: https://bitbucket.org/ryzom/ryzomcore +Vcs-Browser: https://bitbucket.org/ryzom/ryzomcore Package: libnel0 Section: libdevel diff --git a/dist/debian/utopic/debian/rules b/dist/debian/utopic/debian/rules index 2b329f3be..26ace8254 100755 --- a/dist/debian/utopic/debian/rules +++ b/dist/debian/utopic/debian/rules @@ -12,7 +12,7 @@ override_dh_strip: dh_strip -pryzom-tools --dbg-package=ryzom-tools-dbg override_dh_auto_configure: - dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_QT=ON + dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_QT=ON override_dh_install: dh_install diff --git a/dist/debian/vivid/debian/control b/dist/debian/vivid/debian/control index e662d1f37..a802646d4 100644 --- a/dist/debian/vivid/debian/control +++ b/dist/debian/vivid/debian/control @@ -6,14 +6,14 @@ Build-Depends: debhelper (>= 9), cmake(>= 2.6), libxml2-dev, libgl1-mesa-dev, libjpeg8-dev | libjpeg62-dev, libpng12-dev, libopenal-dev, libfreetype6-dev, libxxf86vm-dev, libxrandr-dev, libxrender-dev, libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev, - libboost-dev, libwww-dev, libmysqlclient-dev, + libboost-dev, libmysqlclient-dev, libcpptest-dev, libqt4-dev, libqt4-opengl-dev Standards-Version: 3.9.5 Section: games -Bugs: http://dev.ryzom.com/projects/ryzom/issues -Homepage: http://dev.ryzom.com -Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/nel/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/nel/?op=log +Bugs: https://bitbucket.org/ryzom/ryzomcore/issues +Homepage: https://bitbucket.org/ryzom/ryzomcore/ +Vcs-Hg: https://bitbucket.org/ryzom/ryzomcore +Vcs-Browser: https://bitbucket.org/ryzom/ryzomcore Package: libnel0 Section: libdevel diff --git a/dist/debian/vivid/debian/rules b/dist/debian/vivid/debian/rules index 2b329f3be..26ace8254 100755 --- a/dist/debian/vivid/debian/rules +++ b/dist/debian/vivid/debian/rules @@ -12,7 +12,7 @@ override_dh_strip: dh_strip -pryzom-tools --dbg-package=ryzom-tools-dbg override_dh_auto_configure: - dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_QT=ON + dh_auto_configure -- -DLIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) -DTARGET_CPU=$(DEB_HOST_GNU_CPU) -DWITH_SYMBOLS=ON -DNL_ETC_PREFIX=/etc/nel -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/games/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/games -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_QT=ON override_dh_install: dh_install