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

Crash safely with an error when sphrase is missing on client

Browse source
This commit is contained in:
kaetemi 2014-05-23 19:13:36 +02:00
parent b38468036d
commit ebb20fe86c
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
code/ryzom/client/src/interface_v3/sphrase_manager.cpp
View file

@ -4504,17 +4504,19 @@ sint32 CSPhraseManager::getSheetFromPhrase(const CSPhraseCom &phrase) const
uint32 CSPhraseManager::getTotalActionMalus(const CSPhraseCom &phrase) const uint32 CSPhraseManager::getTotalActionMalus(const CSPhraseCom &phrase) const
{ {
CInterfaceManager *pIM = CInterfaceManager::getInstance(); CInterfaceManager *pIM = CInterfaceManager::getInstance();
CSBrickManager *pBM= CSBrickManager::getInstance(); CSBrickManager *pBM = CSBrickManager::getInstance();
uint32 totalActionMalus= 0; uint32 totalActionMalus = 0;
CCDBNodeLeaf *actMalus = _TotalMalusEquipLeaf ? &*_TotalMalusEquipLeaf CCDBNodeLeaf *actMalus = _TotalMalusEquipLeaf ? &*_TotalMalusEquipLeaf
: &*(_TotalMalusEquipLeaf = NLGUI::CDBManager::getInstance()->getDbProp("UI:VARIABLES:TOTAL_MALUS_EQUIP", false)); : &*(_TotalMalusEquipLeaf = NLGUI::CDBManager::getInstance()->getDbProp("UI:VARIABLES:TOTAL_MALUS_EQUIP", false));
// root brick must not be Power or aura, because Action malus don't apply to them // root brick must not be Power or aura, because Action malus don't apply to them
// (ie leave 0 ActionMalus for Aura or Powers // (ie leave 0 ActionMalus for Aura or Powers
if (!phrase.Bricks.empty()) if (!phrase.Bricks.empty())
{ {
CSBrickSheet *rootBrick= pBM->getBrick(phrase.Bricks[0]); CSBrickSheet *rootBrick = pBM->getBrick(phrase.Bricks[0]);
if(actMalus && !rootBrick->isSpecialPower()) if (!rootBrick)
totalActionMalus= actMalus->getValue32(); nlerror("Invalid root sbrick in sphrase_com '%s'", phrase.Name.toUtf8().c_str());
else if (actMalus && !rootBrick->isSpecialPower())
totalActionMalus = actMalus->getValue32();
} }
return totalActionMalus; return totalActionMalus;
} }