Merge with develop

code/CMakeModules/nel.cmake

@@ -888,9 +888,11 @@ MACRO(NL_SETUP_BUILD)
     ENDIF()
 
     # never display these warnings because they are minor
-    ADD_PLATFORM_FLAGS("-Wno-unused-parameter -Wno-unused-variable -Wunused-function -Wunused-value")
+    ADD_PLATFORM_FLAGS("-Wno-unused-parameter -Wno-unused-variable -Wno-unused-function -Wno-unused-value")
 
-    IF(CLANG)
+    IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "6.0.0")
+      ADD_PLATFORM_FLAGS("-Wno-unused-local-typedefs")
+    ELSEIF(CLANG)
       ADD_PLATFORM_FLAGS("-Wno-unused-private-field -Wno-unused-local-typedef")
     ENDIF()
 

code/nel/src/gui/url_parser.cpp

@@ -228,15 +228,21 @@ namespace NLGUI
 
 		// path already has leading slash
 		if (!path.empty())
+		{
 			result += path;
+		}
 
 		if (!query.empty())
-			if (query.find_first_of("?") != 0)
+		{
-				result += "?";
+			if (query.find_first_of("?") != 0) result += "?";
+
 			result += query;
+		}
 
 		if (!hash.empty())
+		{
 			result += "#" + hash;
+		}
 
 		return result;
 	}

code/nel/src/pacs/primitive_world_image.cpp

@@ -1395,7 +1395,7 @@ void CPrimitiveWorldImage::reaction (const CCollisionSurfaceDesc&	surfaceDesc, c
 void CPrimitiveWorldImage::setGlobalPosition (const UGlobalPosition& pos, CMoveContainer& container, CMovePrimitive &primitive, uint8 worldImage)
 {
 	// Cast type
-	nlassert (dynamic_cast<const CMoveContainer*>(&container));
+	nlassert (dynamic_cast<const CMoveContainer*>(&container) != NULL);
 	const CMoveContainer *cont=(const CMoveContainer*)&container;
 
 	if (!cont->getGlobalRetriever()) return;

code/nel/src/sound/group_controller.cpp

@@ -62,7 +62,7 @@ CGroupController::~CGroupController()
 
 void CGroupController::addSource(CSourceCommon *source)
 {
-	nlassert(this);
+	nlassert(this != NULL);
 
 	m_Sources.insert(source);
 	increaseSources();

code/ryzom/client/src/interface_v3/action_handler_game.cpp

@@ -3204,17 +3204,20 @@ class CHandlerGameConfigMode : public IActionHandler
 				bool bFound = false;
 				string tmp = toString(VideoModes[i].Frequency);
 				for (j = 0; j < (sint)stringFreqList.size(); ++j)
+				{
 					if (stringFreqList[j] == tmp)
 					{
 						bFound = true;
 						break;
 					}
-					if (!bFound)
+				}
-					{
+
-						stringFreqList.push_back(tmp);
+				if (!bFound)
-						if (ClientCfg.Frequency == VideoModes[i].Frequency)
+				{
-							nFoundFreq = j;
+					stringFreqList.push_back(tmp);
-					}
+					if (ClientCfg.Frequency == VideoModes[i].Frequency)
+						nFoundFreq = j;
+				}
 			}
 		}
 		if (nFoundFreq == -1) nFoundFreq = 0;

code/ryzom/client/src/interface_v3/action_handler_help.cpp

@@ -284,7 +284,6 @@ CInterfaceGroup	*CInterfaceHelp::activateNextWindow(CDBCtrlSheet *elt, sint forc
 
 	// If some free window possible, search which to take
 	sint	newIndexWindow= -1;
-	bool	mustPlace= true;
 	bool	mustAddToActiveWindows= true;
 	// if an active window is not in KeepMode, get it.
 	for(i=0;i<_ActiveWindows.size();i++)
@@ -293,7 +292,6 @@ CInterfaceGroup	*CInterfaceHelp::activateNextWindow(CDBCtrlSheet *elt, sint forc
 		if(!_InfoWindows[_ActiveWindows[i]].KeepMode && forceKeepWindow!=(sint)_ActiveWindows[i])
 		{
 			newIndexWindow= _ActiveWindows[i];
-			mustPlace= false;
 			mustAddToActiveWindows= false;
 			break;
 		}

code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp

@@ -1816,8 +1816,7 @@ void CDBCtrlSheet::draw()
 
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
 	CViewRenderer &rVR = *CViewRenderer::getInstance();
-	CRGBA color = CRGBA(255,255,255,255);
+	
-
 	if (_Type != SheetType_Macro)
 	{
 		if (_LastSheetId != _SheetId.getSInt32())

code/ryzom/client/src/interface_v3/group_map.cpp

@@ -840,13 +840,13 @@ bool CGroupMap::getCtrlsUnder (sint32 x, sint32 y, sint32 clipX, sint32 clipY, s
 		(y < (clipY + clipH))))
 		return false;
 
-	bool bFound = false;
+//	bool bFound = false;
 	for (uint32 i = 0; i < _PolyButtons.size(); ++i)
 	{
 		if (_PolyButtons[i]->contains(CVector2f((float)x,(float)y)))
 		{
 			vICL.push_back(_PolyButtons[i]);
-			bFound = true;
+//			bFound = true;
 		}
 	}
 	return CInterfaceGroup::getCtrlsUnder(x, y, clipX, clipY, clipW, clipH, vICL);

code/ryzom/client/src/interface_v3/interface_ddx.cpp

@@ -250,7 +250,6 @@ void CInterfaceDDX::CParam::backupDB()
 
 	if (Widget == ColorButton)
 	{
-		CRGBA col = CRGBA::White;
 		CCDBNodeLeaf *pNL = NLGUI::CDBManager::getInstance()->getDbProp(Link,false);
 		if (pNL != NULL)
 		{

code/ryzom/client/src/interface_v3/interface_manager.cpp

@@ -795,8 +795,8 @@ void CInterfaceManager::uninitOutGame()
 
 	CInterfaceItemEdition::getInstance()->setCurrWindow(NULL);
 
-	NLMISC::TTime initStart;
+//	NLMISC::TTime initStart;
-	initStart = ryzomGetLocalTime ();
+//	initStart = ryzomGetLocalTime ();
 	if (SoundMngr != NULL)
 	{
 		NLSOUND::UAudioMixer *pMixer = SoundMngr->getMixer();
@@ -804,23 +804,23 @@ void CInterfaceManager::uninitOutGame()
 	}
 	//nlinfo ("%d seconds for uninitOutGame", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
 
-	initStart = ryzomGetLocalTime ();
+//	initStart = ryzomGetLocalTime ();
 	CWidgetManager::getInstance()->activateMasterGroup ("ui:outgame", false);
 
 	CInterfaceParser *parser = dynamic_cast< CInterfaceParser* >( CWidgetManager::getInstance()->getParser() );
 	//nlinfo ("%d seconds for activateMasterGroup", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
-	initStart = ryzomGetLocalTime ();
+//	initStart = ryzomGetLocalTime ();
 	parser->removeAll();
 	//nlinfo ("%d seconds for removeAll", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
-	initStart = ryzomGetLocalTime ();
+//	initStart = ryzomGetLocalTime ();
 	reset();
 	//nlinfo ("%d seconds for reset", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
 	// reset the mouse pointer to avoid invalid pointer access
 	CWidgetManager::getInstance()->setPointer( NULL );
-	initStart = ryzomGetLocalTime ();
+//	initStart = ryzomGetLocalTime ();
 	CInterfaceLink::removeAllLinks();
 	//nlinfo ("%d seconds for removeAllLinks", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
-	initStart = ryzomGetLocalTime ();
+//	initStart = ryzomGetLocalTime ();
 	ICDBNode::CTextId textId("UI");
 	NLGUI::CDBManager::getInstance()->getDB()->removeNode(textId);
 	//nlinfo ("%d seconds for removeNode", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
@@ -828,7 +828,7 @@ void CInterfaceManager::uninitOutGame()
 	// Init the action manager
 	{
 
-		initStart = ryzomGetLocalTime ();
+//		initStart = ryzomGetLocalTime ();
 		uninitActions();
 	//	nlinfo ("%d seconds for uninitActions", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
 	}

code/ryzom/client/src/interface_v3/music_player.cpp

@@ -116,7 +116,7 @@ void CMusicPlayer::play (sint index)
 	if(!SoundMngr)
 		return;
 
-	if (index >= 0 && index < _Songs.size())
+	if (index >= 0 && index < (sint)_Songs.size())
 	{
 		if (_State == Paused)
 			stop();

code/ryzom/client/src/login_xdelta.cpp

@@ -525,7 +525,7 @@ CXDeltaPatch::TApplyResult CXDeltaPatch::apply(const std::string &sFileToPatch,
 	}
 
 	SXDeltaCtrl::SSourceInfo *pFromSource = NULL;
-	SXDeltaCtrl::SSourceInfo *pDataSource = NULL;
+//	SXDeltaCtrl::SSourceInfo *pDataSource = NULL;
 
 	if (_Ctrl.SourceInfo.size() > 0)
     {
@@ -533,7 +533,7 @@ CXDeltaPatch::TApplyResult CXDeltaPatch::apply(const std::string &sFileToPatch,
 
 		if (rInfo.IsData)
 		{
-			pDataSource = &rInfo;
+//			pDataSource = &rInfo;
 		}
 		else
 		{

code/ryzom/client/src/network_connection.cpp

@@ -2030,7 +2030,7 @@ void	CNetworkConnection::sendNormalMessage()
 	uint			numPacked = 0;
 
 	// pack each block
-	TGameCycle						lastPackedCycle = 0;
+//	TGameCycle						lastPackedCycle = 0;
 	list<CActionBlock>::iterator	itblock;
 
 	//nldebug("CNET[%p]: sending message %d", this, _CurrentSendNumber);
@@ -2052,7 +2052,7 @@ void	CNetworkConnection::sendNormalMessage()
 
 		//nlassertex((*itblock).Cycle > lastPackedCycle, ("(*itblock).Cycle=%d lastPackedCycle=%d", (*itblock).Cycle, lastPackedCycle));
 
-		lastPackedCycle = block.Cycle;
+//		lastPackedCycle = block.Cycle;
 
 		block.serial(message);
 		++numPacked;

code/ryzom/client/src/player_r2_cl.cpp

@@ -121,9 +121,6 @@ CPlayerR2CL::~CPlayerR2CL()
 
 CGenderInfo * CPlayerR2CL::getGenderInfo()
 {
-	string propName = toString("SERVER:Entities:E%d:P%d", _Slot, CLFECOMMON::PROPERTY_VPB);
-	sint64 vA = NLGUI::CDBManager::getInstance()->getDbProp(propName)->getValue64();
-	SPropVisualA visualA = *(SPropVisualA *)(&vA);
 	EGSPD::CPeople::TPeople ePeople = _Sheet->Race;
 	bool bMale = (_Sheet->Gender == GSGENDER::male);
 

code/ryzom/client/src/r2/instance_map_deco.cpp

@@ -262,7 +262,6 @@ void CInstanceMapDeco::onPreRender(CGroupMap &groupMap)
 		{
 			_Orient->setActive(true);
 			_Orient->setColorRGBA(CRGBA(255, 255, 255, (uint8) (255 * _OrientBlendFactor)));
-			CVector2f worldPos = getWorldPos();
 			sint32 x;
 			sint32 y;
 			groupMap.worldToWindowSnapped(x, y, getWorldPos());

code/ryzom/client/src/r2/tool_choose_pos.cpp

@@ -231,13 +231,11 @@ void CToolChoosePos::updateBeforeRender()
 	if (entity)
 	{
 		CMatrix mat;
-		bool shown = false;
 		if (worldViewRay.OnMiniMap && rayIntersectionType == NoIntersection)
 		{
 			entity->show(false);
 		}
-		else
+		else if (!entity->skeleton())
-		if (!entity->skeleton())
 		{
 			/*
 			nlwarning("Selected entity for the 'create' tool has no skeleton");
@@ -266,7 +264,6 @@ void CToolChoosePos::updateBeforeRender()
 				return;
 			}
 			entity->show(true);
-			shown = true;
 			//
 			CQuat frontQuat(CVector::K,  _CreateAngle - (float) (NLMISC::Pi / 2));
 			inst.setRotQuat(frontQuat);
@@ -277,7 +274,6 @@ void CToolChoosePos::updateBeforeRender()
 		else
 		{
 			entity->show(true);
-			shown = true;
 			//
 			entity->updateVisible(T1,  NULL);
 			entity->updatePos(T1,  NULL);
@@ -293,7 +289,6 @@ void CToolChoosePos::updateBeforeRender()
 			mat.setRot(frontQuat);
 			mat.setPos(entityPos);
 			*/
-			CMatrix skelMatrix = entity->skeleton()->getMatrix();
 			// relative position to skeleton root
 			CVector skelRootRelativePos = entity->skeleton()->getMatrix().getPos() - entity->pos().asVector();
 			// combine quat for front face xform & anim quat