Merge branch 'atys' into fixes

nel/include/nel/misc/xml_macros.h

@@ -1,74 +0,0 @@
-// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010-2021  Winch Gate Property Limited
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-
-#ifndef XML_MACROS_H
-#define XML_MACROS_H
-
-//
-// xmlNodePtr cur;
-// CXMLAutoPtr prop;
-//
-// sint i;
-// XML_READ_SINT(cur, "prop_name", i, -1);
-//
-
-#define XML_READ_UINT(node, name, var, def) { \
-	uint tmp; \
-	prop = (char *) xmlGetProp(node, (xmlChar*)name); \
-	if (prop && fromString((const char*)prop, tmp)) \
-		var = tmp; \
-	else \
-		var = def; \
-}
-
-#define XML_READ_SINT(node, name, var, def) { \
-	sint tmp; \
-	prop = (char *) xmlGetProp(node, (xmlChar*)name); \
-	if (prop && fromString((const char*)prop, tmp)) \
-		var = tmp; \
-	else \
-		var = def; \
-}
-
-#define XML_READ_BOOL(node, name, var, def) { \
-	prop = (char *) xmlGetProp(node, (xmlChar*)name); \
-	if (prop) \
-		var = NLMISC::toBool((const char*)prop); \
-	else \
-		var = def; \
-}
-
-#define XML_READ_COLOR(node, name, var, def) { \
-	NLMISC::CRGBA tmp; \
-	prop = (char *) xmlGetProp(node, (xmlChar*)name); \
-	if (prop && fromString((const char*)prop, tmp)) \
-		var = tmp; \
-	else \
-		var = def; \
-}
-
-#define XML_READ_STRING(node, name, var, def) { \
-	prop = (char *) xmlGetProp(node, (xmlChar*)name); \
-	if (prop) \
-		var = (const char*)prop; \
-	else \
-		var = def; \
-}
-
-#endif // XML_MACROS_H
-

nel/src/3d/lod_character_manager.cpp

@@ -981,10 +981,11 @@ void			CLodCharacterManager::addTextureCompute(CLodCharacterInstance &instance,
 		return;
 
 	// get lookup ptr.
-	nlassert(lodTexture.Texture.size()==NL3D_CLOD_TEXT_SIZE);
 	if (lodTexture.Texture.size() < NL3D_CLOD_TEXT_SIZE)
 		return;
 	
+	nlassert(lodTexture.Texture.size()==NL3D_CLOD_TEXT_SIZE);
+
 	const CLodCharacterTexture::CTUVQ		*lookUpPtr= &lodTexture.Texture[0];
 
 	// apply the lodTexture, taking only better quality (ie nearer 0)

ryzom/client/src/interface_v3/inventory_manager.cpp

@@ -3658,9 +3658,6 @@ void			CInventoryManager::updateItemInfoQueue()
 		return;
 	}
 
-	// CONNECTION:READY not yet sent, so we cannot send requests yet!
-	nlassert(ConnectionReadySent || !_ItemInfoWaiters.size());
-
 	// For All waiters, look if one need update.
 	TItemInfoWaiters::iterator	it;
 	for(it= _ItemInfoWaiters.begin();it!=_ItemInfoWaiters.end();it++)

ryzom/client/src/login.cpp

@@ -3300,7 +3300,6 @@ bool loginIntroSkip;
 void loginIntro()
 {
 	// Display of nevrax logo is done at init time (see init.cpp) just before addSearchPath (second one)
-#if 0
 	for (uint i = 0; i < 1; i++) // previously display nevrax then nvidia
 	{
 		if (i != 0)
@@ -3338,7 +3337,6 @@ void loginIntro()
 			NLGUI::CDBManager::getInstance()->flushObserverCalls();
 		}
 	}
-#endif
 	beginLoading(StartBackground);
 	ProgressBar.finish();
 }