Merge branch 'develop' of github.com:ryzom/ryzomcore into develop

nel/include/nel/sound/driver/sound_driver.h

@@ -191,7 +191,7 @@ public:
 	/// Create a native music channel, only supported by the FMod driver.
 	virtual IMusicChannel *createMusicChannel() { return NULL; }
 	/** Get music info. Returns false if the song is not found or the function is not implemented.
-	 *  \param filepath path to file, CPath::lookup done by driver
+	 *  \param filepath full path to file
 	 *  \param artist returns the song artist (empty if not available)
 	 *  \param title returns the title (empty if not available)
 	 */

nel/src/misc/system_info.cpp

@@ -179,7 +179,6 @@
 #else
 #	include <sys/types.h>
 #	include <sys/stat.h>
-#	include <sys/sysctl.h>
 #	include <fcntl.h>
 #	include <unistd.h>
 #	include <cerrno>

nel/src/sound/audio_decoder.cpp

@@ -110,10 +110,9 @@ IAudioDecoder *IAudioDecoder::createAudioDecoder(const std::string &type, NLMISC
 
 bool IAudioDecoder::getInfo(const std::string &filepath, std::string &artist, std::string &title, float &length)
 {
-	std::string lookup = CPath::lookup(filepath, false);
-	if (lookup.empty())
+	if (filepath.empty() || !CFile::fileExists(filepath))
 	{
-		nlwarning("Music file %s does not exist!", filepath.c_str());
+		nlwarning("Music file '%s' does not exist!", filepath.c_str());
 		return false;
 	}
 
@@ -121,7 +120,7 @@ bool IAudioDecoder::getInfo(const std::string &filepath, std::string &artist, st
 	CIFile ifile;
 	ifile.setCacheFileOnOpen(false);
 	ifile.allowBNPCacheFileOnOpen(false);
-	if (ifile.open(lookup))
+	if (ifile.open(filepath))
 		return CAudioDecoderFfmpeg::getInfo(&ifile, artist, title, length);
 #else
 	std::string type = CFile::getExtension(filepath);
@@ -132,7 +131,7 @@ bool IAudioDecoder::getInfo(const std::string &filepath, std::string &artist, st
 		CIFile ifile;
 		ifile.setCacheFileOnOpen(false);
 		ifile.allowBNPCacheFileOnOpen(false);
-		if (ifile.open(lookup))
+		if (ifile.open(filepath))
 			return CAudioDecoderVorbis::getInfo(&ifile, artist, title, length);
 
 		nlwarning("Unable to open: '%s'", filepath.c_str());
@@ -143,7 +142,7 @@ bool IAudioDecoder::getInfo(const std::string &filepath, std::string &artist, st
 		CIFile ifile;
 		ifile.setCacheFileOnOpen(false);
 		ifile.allowBNPCacheFileOnOpen(false);
-		if (ifile.open(lookup))
+		if (ifile.open(filepath))
 			return CAudioDecoderMP3::getInfo(&ifile, artist, title, length);
 
 		nlwarning("Unable to open: '%s'", filepath.c_str());

nel/src/sound/driver/fmod/sound_driver_fmod.cpp

@@ -496,36 +496,20 @@ bool getTag (std::string &result, const char *tag, FSOUND_STREAM *stream)
 }
 
 /** Get music info. Returns false if the song is not found or the function is not implemented. 
- *  \param filepath path to file, CPath::lookup done by driver
+ *  \param filepath full path to file
  *  \param artist returns the song artist (empty if not available)
  *  \param title returns the title (empty if not available)
  */
 bool CSoundDriverFMod::getMusicInfo(const std::string &filepath, std::string &artist, std::string &title, float &length)
 {
-	/* Open a stream, get the tag if it exists, close the stream */
-	string pathName = CPath::lookup(filepath, false);
-	uint32 fileOffset = 0, fileSize = 0;
-	if (pathName.empty())
+	if (filepath.empty() || !CFile::fileExists(filepath))
 	{
 		nlwarning("NLSOUND FMod Driver: Music file %s not found!", filepath.c_str());
 		return false;
 	}
-	// if the file is in a bnp
-	if (pathName.find('@') != string::npos)
-	{
-		if (CBigFile::getInstance().getFileInfo(pathName, fileSize, fileOffset))
-		{
-			// set pathname to bnp
-			pathName = pathName.substr(0, pathName.find('@'));			
-		}
-		else
-		{
-			nlwarning("NLSOUND FMod Driver: BNP BROKEN");
-			return false;
-		}
-	}
 
-	FSOUND_STREAM *stream = FSOUND_Stream_Open((const char *)CPath::lookup(filepath, false).c_str(), FSOUND_2D, (sint)fileOffset, (sint)fileSize);
+	uint32 fileOffset = 0, fileSize = 0;
+	FSOUND_STREAM *stream = FSOUND_Stream_Open(filepath.c_str(), FSOUND_2D, (sint)fileOffset, (sint)fileSize);
 	if (stream)
 	{
 		getTag(artist, "ARTIST", stream);

nel/src/sound/driver/fmod/sound_driver_fmod.h

@@ -112,7 +112,7 @@ public:
 	virtual IMusicChannel *createMusicChannel();
 	
 	/** Get music info. Returns false if the song is not found or the function is not implemented.
-	 *  \param filepath path to file, CPath::lookup done by driver
+	 *  \param filepath full path to file
 	 *  \param artist returns the song artist (empty if not available)
 	 *  \param title returns the title (empty if not available)
 	 */

nel/src/web/http_client_curl.cpp

@@ -190,9 +190,12 @@ bool CCurlHttpClient::receive(string &res, bool verbose)
 
 // ***************************************************************************
 void CCurlHttpClient::disconnect()
+{
+	if (_CurlStruct)
 	{
 		curl_easy_cleanup(_Curl);
 		_CurlStruct = NULL;
+	}
 	curl_global_cleanup();
 }
 

ryzom/client/src/decal.cpp

@@ -162,7 +162,9 @@ CDecal::CDecal()
 	{
 		DecalAttenuationVertexProgram = new CVertexProgramDecalAttenuation();
 	}
-	_ShadowMap = new CShadowMap(&(((CSceneUser *) Scene)->getScene().getRenderTrav().getShadowMapManager()));
+
+	// initialized in render() as depends on scene
+	_ShadowMap = NULL;
 	_Material.initUnlit();
 	_Diffuse = CRGBA::White;
 	_Emissive = CRGBA::Black;
@@ -250,8 +252,12 @@ CRGBA CDecal::getDiffuse() const
 
 // ****************************************************************************
 CDecal::~CDecal()
+{
+	if (_ShadowMap)
 	{
 		delete _ShadowMap;
+		_ShadowMap = NULL;
+	}
 }
 
 // ****************************************************************************
@@ -527,7 +533,12 @@ void CDecal::render(NL3D::UDriver &/* drv */,
 	//
 	float tileNear = Landscape->getTileNear();
 	//
+	if (!_ShadowMap)
+	{
+		_ShadowMap = new CShadowMap(&(((CSceneUser *) Scene)->getScene().getRenderTrav().getShadowMapManager()));
 		nlassert(_ShadowMap);
+	}
+
 	_ShadowMap->LocalClipPlanes.resize(4);
 	CVector corners[4] =
 	{

ryzom/client/src/interface_v3/action_handler_game.cpp

@@ -2822,24 +2822,6 @@ public:
 
 	virtual void execute (CCtrlBase * /* pCaller */, const string &Params)
 	{
-		/* // Previous version (multiple pressed on a desktop change a central window
-		uint desktop;
-		fromString(Params, desktop);
-		if (desktop <MAX_NUM_MODES)
-		{
-			CInterfaceManager	*pIM= CInterfaceManager::getInstance();
-			const string procNames[MAX_NUM_MODES] = { "tb_setexp", "tb_setinfo", "tb_setlab", "tb_setkeys" };
-			const string dbNames[MAX_NUM_MODES] = { "", "UI:SAVE:CURRENT_INFO_MODE", "UI:SAVE:CURRENT_LAB_MODE", "UI:SAVE:CURRENT_KEY_MODE" };
-			string sValue;
-			CCDBNodeLeaf *pNL = NLGUI::CDBManager::getInstance()->getDbProp(dbNames[desktop], false);
-			if (pNL != NULL)
-				sValue = NLMISC::toString((sint32)pNL->getValue64());
-			vector<string> vecStr;
-			vecStr.push_back(procNames[desktop]);
-			vecStr.push_back(sValue);
-			CWidgetManager::getInstance()->runProcedure(procNames[desktop], NULL, vecStr);
-		}*/
-
 		CInterfaceManager *pIM = CInterfaceManager::getInstance();
 		CGroupContainer *pGC = dynamic_cast<CGroupContainer*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:gestion_windows"));
 		if (pGC == NULL)
@@ -2850,11 +2832,14 @@ public:
 		CInterfaceElement *pIE = CWidgetManager::getInstance()->getElementFromId("ui:interface:gestion_windows:close");
 		if (pIE != NULL) pIE->setActive(false);
 
+		bool switchDesktop = false;
+
 		CActionsManager *pAM = &Actions;
 		if (!pAM->valide(CAction::CName("set_desktop",Params.c_str())))
 		{
 			pGC->setActive(false);
 			_FirstTime = true;
+			switchDesktop = true;
 		}
 		else // Key is down
 		{
@@ -2862,11 +2847,7 @@ public:
 			if (_FirstTime)
 			{
 				_FirstTime = false;
-
-				vector<string> vecStr;
-				vecStr.push_back("tb_setdesktop");
-				vecStr.push_back(Params);
-				CWidgetManager::getInstance()->runProcedure("tb_setdesktop", NULL, vecStr);
+				switchDesktop = true;
 			}
 			else // Not the first time
 			{
@@ -2876,6 +2857,13 @@ public:
 				CWidgetManager::getInstance()->setTopWindow(pGC);
 			}
 		}
+		if (switchDesktop)
+		{
+			vector<string> vecStr;
+			vecStr.push_back("tb_setdesktop");
+			vecStr.push_back(Params);
+			CWidgetManager::getInstance()->runProcedure("tb_setdesktop", NULL, vecStr);
+		}
 	}
 private:
 	bool _FirstTime;

ryzom/client/src/interface_v3/dbctrl_sheet.cpp

@@ -540,6 +540,9 @@ CCtrlDraggable(param)
 	_SapBuffIcon = "ico_sap.tga";
 	_StaBuffIcon = "ico_stamina.tga";
 	_FocusBuffIcon = "ico_focus.tga";
+
+	_RegenText = NULL;
+	_RegenTextValue = 0;
 }
 
 // ----------------------------------------------------------------------------
@@ -564,6 +567,11 @@ CDBCtrlSheet::~CDBCtrlSheet()
 			Driver->deleteTextureFile(_GuildSymb);
 		_GuildSymb = NULL;
 	}
+	if (_RegenText)
+	{
+		delete _RegenText;
+		_RegenText = NULL;
+	}
 
 	// ensure erase static
 	if(this==_CurrMenuSheet)		_CurrMenuSheet = NULL;
@@ -2045,6 +2053,12 @@ void CDBCtrlSheet::draw()
 		if (!_LastSheetId)
 		{
 			_RegenTickRange = CTickRange();
+			if (_RegenText)
+			{
+				delete _RegenText;
+				_RegenText = NULL;
+				_RegenTextValue = 0;
+			}
 		}
 		else
 		{
@@ -2071,6 +2085,36 @@ void CDBCtrlSheet::draw()
 			{
 				rVR.drawQuad(_RenderLayer + 1, regenTris[tri], backTex, CRGBA::White, false);
 			}
+
+			if (!_RegenText) {
+				_RegenText = new CViewText(CViewBase::TCtorParam());
+				_RegenText->setId(getId() + ":regen");
+				_RegenText->setParent(_Parent);
+				_RegenText->setOverflowText(ucstring(""));
+				_RegenText->setModulateGlobalColor(false);
+				_RegenText->setMultiLine(false);
+				_RegenText->setTextMode(CViewText::ClipWord);
+				_RegenText->setFontSizing("0", "0");
+				// TODO: font size / color hardcoded.
+				_RegenText->setFontSize(8);
+				_RegenText->setColor(CRGBA::White);
+				_RegenText->setShadow(true);
+				_RegenText->setActive(true);
+				_RegenText->updateTextContext();
+			}
+
+			// TODO: ticks in second hardcoded
+			uint32 nextValue = _RegenTickRange.EndTick > LastGameCycle ? (_RegenTickRange.EndTick - LastGameCycle) / 10 : 0;
+			if (_RegenTextValue != nextValue)
+			{
+				_RegenTextValue = nextValue;
+				_RegenText->setText(toString("%d", _RegenTextValue));
+				_RegenText->updateTextContext();
+			}
+			_RegenText->setXReal(_XReal+1);
+			_RegenText->setYReal(_YReal+2);
+			_RegenText->setRenderLayer(_RenderLayer+2);
+			_RegenText->draw();
 		}
 	}
 

ryzom/client/src/interface_v3/dbctrl_sheet.h

@@ -56,6 +56,7 @@ class COutpostBuildingSheet;
 namespace NLGUI
 {
 	class CViewRenderer;
+	class CViewText;
 }
 
 class CDBCtrlSheet;
@@ -736,6 +737,8 @@ protected:
 	sint8			_ArmourColorIndex;
 
 	CTickRange		_RegenTickRange;
+	NLGUI::CViewText	*_RegenText;
+	uint32			_RegenTextValue;
 
 	/// D'n'd
 	sint32		_DragX, _DragY;

ryzom/client/src/interface_v3/group_map.cpp

@@ -2471,7 +2471,8 @@ void CGroupMap::updateMatchedLandmarks()
 		std::vector<std::pair<string,string> > params;
 		params.clear();
 		params.push_back(std::pair<string,string>("id", toString("lm%d", k)));
-		params.push_back(std::pair<string,string>("tooltip", _MatchedLandmarks[k].Title.toUtf8()));
+		// ctrl base expects utf8 string to start with "u:"
+		params.push_back(std::pair<string,string>("tooltip", "u:" + _MatchedLandmarks[k].Title.toUtf8()));
 		params.push_back(std::pair<string,string>("index", toString(k)));
 
 		CInterfaceGroup *g = CWidgetManager::getInstance()->getParser()->createGroupInstance("lm_search_result", pL->getId(), params);
@@ -2675,7 +2676,7 @@ void CGroupMap::setLandmarkFilter(const std::string &s)
 	if (!s.empty()) {
 		ucstring ucs;
 		ucs.fromUtf8(s);
-		splitUCString(toLower(s), ucstring(" "), _LandmarkFilter);
+		splitUCString(toLower(ucs), ucstring(" "), _LandmarkFilter);
 	}
 
 	// recreate landmarks