diff --git a/nel/include/nel/misc/xml_macros.h b/nel/include/nel/misc/xml_macros.h index d5c8efc93..e69de29bb 100644 --- a/nel/include/nel/misc/xml_macros.h +++ b/nel/include/nel/misc/xml_macros.h @@ -1,74 +0,0 @@ -// NeL - MMORPG Framework -// 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 . - - - -#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 - diff --git a/nel/src/3d/lod_character_manager.cpp b/nel/src/3d/lod_character_manager.cpp index 8e062bf07..12272c136 100644 --- a/nel/src/3d/lod_character_manager.cpp +++ b/nel/src/3d/lod_character_manager.cpp @@ -981,9 +981,10 @@ 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]; diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/anim.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/anim.ms old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/anim.py b/nel/tools/build_gamedata/generators/max_exporter_scripts/anim.py old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/clod.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/clod.ms old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/clod.py b/nel/tools/build_gamedata/generators/max_exporter_scripts/clod.py old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/cmb.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/cmb.ms old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/cmb.py b/nel/tools/build_gamedata/generators/max_exporter_scripts/cmb.py old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/ig.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/ig.ms old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.ms old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/shape.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/shape.ms old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/skel.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/skel.ms old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/swt.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/swt.ms old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/swt.py b/nel/tools/build_gamedata/generators/max_exporter_scripts/swt.py old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/veget.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/veget.ms old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/veget.py b/nel/tools/build_gamedata/generators/max_exporter_scripts/veget.py old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/zone.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/zone.ms old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/generators/simple_max_exporter_template/export_footer.ms b/nel/tools/build_gamedata/generators/simple_max_exporter_template/export_footer.ms old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/generators/simple_max_exporter_template/export_header.ms b/nel/tools/build_gamedata/generators/simple_max_exporter_template/export_header.ms old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_footer.ms b/nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_footer.ms old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_header.ms b/nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_header.ms old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/processes/anim/maxscript/anim_export.ms b/nel/tools/build_gamedata/processes/anim/maxscript/anim_export.ms old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/processes/clodbank/maxscript/clod_export.ms b/nel/tools/build_gamedata/processes/clodbank/maxscript/clod_export.ms old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/processes/ig/maxscript/ig_export.ms b/nel/tools/build_gamedata/processes/ig/maxscript/ig_export.ms old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms b/nel/tools/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/processes/pacs_prim/maxscript/pacs_prim_export.ms b/nel/tools/build_gamedata/processes/pacs_prim/maxscript/pacs_prim_export.ms old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/processes/rbank/maxscript/cmb_export.ms b/nel/tools/build_gamedata/processes/rbank/maxscript/cmb_export.ms old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/processes/shape/maxscript/shape_export.ms b/nel/tools/build_gamedata/processes/shape/maxscript/shape_export.ms old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/processes/skel/maxscript/skel_export.ms b/nel/tools/build_gamedata/processes/skel/maxscript/skel_export.ms old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/processes/swt/maxscript/swt_export.ms b/nel/tools/build_gamedata/processes/swt/maxscript/swt_export.ms old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/processes/veget/maxscript/veget_export.ms b/nel/tools/build_gamedata/processes/veget/maxscript/veget_export.ms old mode 100644 new mode 100755 diff --git a/nel/tools/build_gamedata/processes/zone/maxscript/zone_export.ms b/nel/tools/build_gamedata/processes/zone/maxscript/zone_export.ms old mode 100644 new mode 100755 diff --git a/ryzom/client/src/interface_v3/inventory_manager.cpp b/ryzom/client/src/interface_v3/inventory_manager.cpp index 8c0241acc..1bb3c478f 100644 --- a/ryzom/client/src/interface_v3/inventory_manager.cpp +++ b/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++) diff --git a/ryzom/client/src/login.cpp b/ryzom/client/src/login.cpp index 16ab6698c..e8ee2cbe4 100644 --- a/ryzom/client/src/login.cpp +++ b/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(); }