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

Merge

Browse source
This commit is contained in:
vl 2010-07-19 10:12:46 +02:00
commit edeeb18515
6 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/ryzom/client/src/character_cl.cpp
View file

@ -8848,6 +8848,7 @@ void CCharacterCL::alignFX(UParticleSystemInstance instance, float scale /* = 1.
{
// copy matrix from parent
CMatrix fxMatrix;
fxMatrix.identity();
buildAlignMatrix(fxMatrix);
alignFX(instance, fxMatrix, scale, localOffset);
}

4
code/ryzom/client/src/interface_v3/action_handler_help.cpp
View file

@ -1274,10 +1274,10 @@ void getDamageText(CDBCtrlSheet *item, const CItemSheet*pIS, ucstring &itemText,
string strMod;
if(displayAsMod)
strMod= itemInfo.CurrentDamage>=0?"+":"";
strMod= "+";
strFindReplace(itemText, "%dmg", strMod + toString(itemInfo.CurrentDamage));
if(displayAsMod)
strMod= itemInfo.MaxDamage>=0?"+":"";
strMod= "+";
strFindReplace(itemText, "%max_dmg", strMod + toString(itemInfo.MaxDamage));
if(pIS->Family!=ITEMFAMILY::AMMO)

2
code/ryzom/client/src/interface_v3/group_html.cpp
View file

@ -2473,7 +2473,7 @@ void CGroupHTML::setTitle (const ucstring &title)
CInterfaceElement *parent = getParent();
if (parent)
{
if (parent = parent->getParent())
if ((parent = parent->getParent()))
{
CGroupContainer *container = dynamic_cast<CGroupContainer*>(parent);
if (container)

8
code/ryzom/client/src/interface_v3/interface_parser.cpp
View file

@ -3391,7 +3391,7 @@ bool CInterfaceParser::parseActionCategory(xmlNodePtr cur)
nlwarning("<CInterfaceParser::parseActionCategory> cannot create instance from template");
}
}
while(instanceNode = CIXml::getNextChildNode(instanceNode, "instance"));
while((instanceNode = CIXml::getNextChildNode(instanceNode, "instance")));
}
parameter.Values.resize (CIXml::countChildren(paramNode, "value"));
@ -3422,18 +3422,18 @@ bool CInterfaceParser::parseActionCategory(xmlNodePtr cur)
valueIndex++;
}
while(valueNode = CIXml::getNextChildNode(valueNode, "value"));
while((valueNode = CIXml::getNextChildNode(valueNode, "value")));
}
parameterIndex++;
}
while(paramNode = CIXml::getNextChildNode(paramNode, "parameter"));
while((paramNode = CIXml::getNextChildNode(paramNode, "parameter")));
}
// Next action
actionIndex++;
}
while(actionNode = CIXml::getNextChildNode(actionNode, "action"));
while((actionNode = CIXml::getNextChildNode(actionNode, "action")));
}
// Add this category to the action manager

2
code/ryzom/client/src/interface_v3/lua_ihm.cpp
View file

@ -617,7 +617,7 @@ int CLuaIHM::luaMethodCall(lua_State *ls)
//
state->remove(1); // remove 'self' reference from parameters stack
//
int numResults;
int numResults = 0;
int initialStackSize = state->getTop();
try
{

2
code/ryzom/client/src/user_entity.cpp
View file

@ -456,7 +456,7 @@ void CUserEntity::updateVisualPropertyBehaviour(const NLMISC::TGameCycle &/* gam
bc.BehavTime = TimeInSec;
if(VerboseAnimUser)
{
nlinfo("UE::updateVPBeha: '%d(%s)'.", bc.Behav.Behaviour, MBEHAV::behaviourToString(bc.Behav.Behaviour).c_str());
nlinfo("UE::updateVPBeha: '%d(%s)'.", (int)bc.Behav.Behaviour, MBEHAV::behaviourToString(bc.Behav.Behaviour).c_str());
}
CCDBNodeLeaf *targetList0 = dynamic_cast<CCDBNodeLeaf *>(_DBEntry->getNode(CLFECOMMON::PROPERTY_TARGET_LIST_0));
CCDBNodeLeaf *targetList1 = dynamic_cast<CCDBNodeLeaf *>(_DBEntry->getNode(CLFECOMMON::PROPERTY_TARGET_LIST_1));