From 1594ec45f88b6ee3c95df035b10920edc670267c Mon Sep 17 00:00:00 2001 From: dfighter1985 Date: Thu, 21 Jun 2012 20:21:01 +0200 Subject: [PATCH] CHANGED: #1471 CViewTextIDFormated no longer depends on Ryzom game related code. --- code/nel/include/nel/gui/view_text_id.h | 2 ++ .../interface_v3/view_text_id_formated.cpp | 24 ++++++------------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/code/nel/include/nel/gui/view_text_id.h b/code/nel/include/nel/gui/view_text_id.h index e293f0d4c..fea01f59c 100644 --- a/code/nel/include/nel/gui/view_text_id.h +++ b/code/nel/include/nel/gui/view_text_id.h @@ -144,6 +144,8 @@ namespace NLGUI std::string _DBPath; #endif + static IViewTextProvider* getTextProvider(){ return textProvider; } + private: static IViewTextProvider *textProvider; diff --git a/code/ryzom/client/src/interface_v3/view_text_id_formated.cpp b/code/ryzom/client/src/interface_v3/view_text_id_formated.cpp index 1105197b6..24dd2c376 100644 --- a/code/ryzom/client/src/interface_v3/view_text_id_formated.cpp +++ b/code/ryzom/client/src/interface_v3/view_text_id_formated.cpp @@ -16,20 +16,10 @@ -#include "stdpch.h" #include "view_text_id_formated.h" #include "nel/gui/view_text_formated.h" -#include "../string_manager_client.h" -#include "../user_entity.h" -#include "../entities.h" #include "nel/misc/xml_auto_ptr.h" -using namespace STRING_MANAGER; - -//////////// -// EXTERN // -//////////// - NLMISC_REGISTER_OBJECT(CViewBase, CViewTextIDFormated, std::string, "text_id_formated"); // ********************************************************************************* @@ -57,18 +47,18 @@ void CViewTextIDFormated::checkCoords() { ucstring result, formatedResult; bool bValid; - #if defined(NL_DEBUG) - if (ClientCfg.Local) + + if( CViewTextID::getTextProvider() == NULL ) { - if (!_DBPath.empty()) result = ucstring(_DBPath); - else result = ucstring("Text ID = " + NLMISC::toString(_TextId)); + if(!_DBPath.empty()) + result = ucstring(_DBPath); + else + result = ucstring("Text ID = " + NLMISC::toString(_TextId)); bValid = true; } else - #endif { - CStringManagerClient *pSMC = CStringManagerClient::instance(); - bValid = pSMC->getDynString (_TextId, result); + bValid = CViewTextID::getTextProvider()->getDynString (_TextId, result); } formatedResult = CViewTextFormated::formatString(_FormatString, result); //