Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Hide over the limit landmarks instead deleting them

Browse source 
--HG--
branch : misc-patches
This commit is contained in:
Nimetu 2014-01-03 22:43:00 +02:00
parent 4c2531474a
commit 5b09380bff
5 changed files with 40 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
code/ryzom/client/src/continent_manager.cpp
View file

@ -529,36 +529,18 @@ void CContinentManager::serialUserLandMarks(NLMISC::IStream &f)
f.serialCont(dummy);
}
}
// The number of stored landmarks is not checked at this time, but if we receive a
// lower value in the server database, we will cut down using checkNumberOfUserLandmarks()
}
}
//-----------------------------------------------
// checkNumberOfLandmarks
// updateUserLandMarks
//-----------------------------------------------
void CContinentManager::checkNumberOfUserLandmarks( uint maxNumber )
void CContinentManager::updateUserLandMarks()
{
for ( TContinents::iterator it=_Continents.begin(); it!=_Continents.end(); ++it )
{
CContinent *cont = (*it).second;
if ( cont->UserLandMarks.size() > maxNumber )
{
// Just cut down the last landmarks (in case of hacked file)
if ( cont == _Current )
{
CGroupMap *pMap = dynamic_cast<CGroupMap*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:map:content:map_content:actual_map"));
if ( pMap )
pMap->removeExceedingUserLandMarks( maxNumber );
}
else
{
cont->UserLandMarks.resize( maxNumber );
}
}
}
CGroupMap *pMap = dynamic_cast<CGroupMap*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:map:content:map_content:actual_map"));
if ( pMap )
pMap->updateUserLandMarks();
}

4
code/ryzom/client/src/continent_manager.h
View file

@ -112,8 +112,8 @@ public:
// load / saves all user landMarks
void serialUserLandMarks(NLMISC::IStream &f);
// ensure the number of landmarks per continent does not exceed maxNumber
void checkNumberOfUserLandmarks( uint maxNumber );
// rebuild visible landmarks on current map
void updateUserLandMarks();
// load / saves all fow maps
void serialFOWMaps();

28
code/ryzom/client/src/interface_v3/group_map.cpp
View file

@ -2390,8 +2390,9 @@ void CGroupMap::createContinentLandMarks()
// Continent Landmarks
createLMWidgets(_CurContinent->ContLandMarks);
uint nbUserLandMarks = std::min( uint(_CurContinent->UserLandMarks.size()), CContinent::getMaxNbUserLandMarks());
// User Landmarks
for(k = 0; k < _CurContinent->UserLandMarks.size(); ++k)
for(k = 0; k < nbUserLandMarks; ++k)
{
NLMISC::CVector2f mapPos;
worldToMap(mapPos, _CurContinent->UserLandMarks[k].Pos);
@ -2429,7 +2430,8 @@ void CGroupMap::updateUserLandMarks()
removeLandMarks(_UserLM);
// Re create User Landmarks
for(k = 0; k < _CurContinent->UserLandMarks.size(); ++k)
uint nbUserLandMarks = std::min( uint(_CurContinent->UserLandMarks.size()), CContinent::getMaxNbUserLandMarks());
for(k = 0; k < nbUserLandMarks; ++k)
{
NLMISC::CVector2f mapPos;
worldToMap(mapPos, _CurContinent->UserLandMarks[k].Pos);
@ -2520,7 +2522,7 @@ CCtrlButton *CGroupMap::addUserLandMark(const NLMISC::CVector2f &pos, const ucst
void CGroupMap::removeUserLandMark(CCtrlButton *button)
{
if (_CurContinent == NULL) return;
nlassert(_CurContinent->UserLandMarks.size() == _UserLM.size());
nlassert(_CurContinent->UserLandMarks.size() >= _UserLM.size());
for(uint k = 0; k < _UserLM.size(); ++k)
{
if (_UserLM[k] == button)
@ -2528,6 +2530,13 @@ void CGroupMap::removeUserLandMark(CCtrlButton *button)
delCtrl(_UserLM[k]);
_UserLM.erase(_UserLM.begin() + k);
_CurContinent->UserLandMarks.erase(_CurContinent->UserLandMarks.begin() + k);
if (_CurContinent->UserLandMarks.size() > _UserLM.size())
{
// if user has over the limit landmarks, then rebuild visible markers
updateUserLandMarks();
}
return;
}
}
@ -2537,7 +2546,7 @@ void CGroupMap::removeUserLandMark(CCtrlButton *button)
void CGroupMap::updateUserLandMark(CCtrlButton *button, const ucstring &newTitle, const CUserLandMark::EUserLandMarkType lmType)
{
if (_CurContinent == NULL) return;
nlassert(_CurContinent->UserLandMarks.size() == _UserLM.size());
nlassert(_CurContinent->UserLandMarks.size() >= _UserLM.size());
for(uint k = 0; k < _UserLM.size(); ++k)
{
if (_UserLM[k] == button)
@ -2557,7 +2566,7 @@ CUserLandMark CGroupMap::getUserLandMark(CCtrlButton *button) const
{
CUserLandMark ulm;
if (_CurContinent == NULL) return ulm;
nlassert(_CurContinent->UserLandMarks.size() == _UserLM.size());
nlassert(_CurContinent->UserLandMarks.size() >= _UserLM.size());
for(uint k = 0; k < _UserLM.size(); ++k)
{
if (_UserLM[k] == button)
@ -2569,15 +2578,6 @@ CUserLandMark CGroupMap::getUserLandMark(CCtrlButton *button) const
return ulm;
}
//============================================================================================================
void CGroupMap::removeExceedingUserLandMarks(uint maxNumber)
{
while (_UserLM.size() > maxNumber)
{
removeUserLandMark(_UserLM.back());
}
}
//============================================================================================================
uint CGroupMap::getNumUserLandMarks() const

2
code/ryzom/client/src/interface_v3/group_map.h
View file

@ -171,8 +171,6 @@ public:
void targetLandmark(CCtrlButton *lm);
// get the world position of a landmark or return vector Null if not found
void getLandmarkPosition(const CCtrlButton *lm, NLMISC::CVector2f &worldPos);
// remove some landmarks if there are too many
void removeExceedingUserLandMarks(uint maxNumber);
//Remove and re-create UserLandMarks
void updateUserLandMarks();

3
code/ryzom/client/src/interface_v3/interface_manager.cpp
View file

@ -1810,8 +1810,7 @@ bool CInterfaceManager::loadConfig (const string &filename)
// ------------------------------------------------------------------------------------------------
void CInterfaceManager::CDBLandmarkObs::update(ICDBNode *node)
{
uint nbBonusLandmarks = ((CCDBNodeLeaf*)node)->getValue32();
ContinentMngr.checkNumberOfUserLandmarks( STANDARD_NUM_USER_LANDMARKS + nbBonusLandmarks );
ContinentMngr.updateUserLandMarks();
}