mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-29 20:30:54 +00:00
Changed: #878 Fix typos in comments/code
This commit is contained in:
parent
9550ed9d36
commit
54b6685a9e
61 changed files with 118 additions and 106 deletions
|
@ -588,7 +588,7 @@ struct CFile
|
||||||
static bool createEmptyFile (const std::string& filename);
|
static bool createEmptyFile (const std::string& filename);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a new filename that doesn't exists. It's used for screenshot filename for example.
|
* Return a new filename that doesn't exist. It's used for screenshot filename for example.
|
||||||
* example: findNewFile("foobar.tga");
|
* example: findNewFile("foobar.tga");
|
||||||
* will try foobar001.tga, if the file exists, try foobar002.tga and so on until it finds an unexistant file.
|
* will try foobar001.tga, if the file exists, try foobar002.tga and so on until it finds an unexistant file.
|
||||||
*/
|
*/
|
||||||
|
@ -700,7 +700,7 @@ struct CFile
|
||||||
static bool createDirectoryTree(const std::string &dirname);
|
static bool createDirectoryTree(const std::string &dirname);
|
||||||
|
|
||||||
/** Try to set the file access to read/write if not already set.
|
/** Try to set the file access to read/write if not already set.
|
||||||
* return true if the file doesn't exists or if the file already have RW access.
|
* return true if the file doesn't exist or if the file already have RW access.
|
||||||
* Work actually only on Windows and returns always true on other platforms.
|
* Work actually only on Windows and returns always true on other platforms.
|
||||||
* \return true if RW access is granted
|
* \return true if RW access is granted
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -34,7 +34,7 @@ namespace NLMISC {
|
||||||
* with list<>/set<> etc... node allocations.
|
* with list<>/set<> etc... node allocations.
|
||||||
*
|
*
|
||||||
* NB: if used with a vector<> or a deque<> (ie if allocate(..,n) is called with n>1), it's still work,
|
* NB: if used with a vector<> or a deque<> (ie if allocate(..,n) is called with n>1), it's still work,
|
||||||
* but it's use malloc()/free() instead, so it is fully unuseful in this case :)
|
* but it's use malloc()/free() instead, so it is fully useless in this case :)
|
||||||
*
|
*
|
||||||
* CSTLBlockAllocator use a pointer on a CBlockMemory, so multiple containers can share the same
|
* CSTLBlockAllocator use a pointer on a CBlockMemory, so multiple containers can share the same
|
||||||
* blockMemory, for maximum space/speed efficiency.
|
* blockMemory, for maximum space/speed efficiency.
|
||||||
|
|
|
@ -1341,7 +1341,7 @@ void registerGlExtensions(CGlExtensions &ext)
|
||||||
// VBHard swap without flush of the VAR.
|
// VBHard swap without flush of the VAR.
|
||||||
ext.NVStateVARWithoutFlush= GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV;
|
ext.NVStateVARWithoutFlush= GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV;
|
||||||
else
|
else
|
||||||
// VBHard with unuseful flush of the VAR.
|
// VBHard with useless flush of the VAR.
|
||||||
ext.NVStateVARWithoutFlush= GL_VERTEX_ARRAY_RANGE_NV;
|
ext.NVStateVARWithoutFlush= GL_VERTEX_ARRAY_RANGE_NV;
|
||||||
|
|
||||||
// Check NV_occlusion_query
|
// Check NV_occlusion_query
|
||||||
|
|
|
@ -242,7 +242,7 @@ void CLandscapeVegetableBlock::createVegetableIGForDistType(uint i, CVegetable
|
||||||
// generate
|
// generate
|
||||||
_Patch->generateTileVegetable(vegetIg, i, tms, tmt, vbCreateCtx);
|
_Patch->generateTileVegetable(vegetIg, i, tms, tmt, vbCreateCtx);
|
||||||
|
|
||||||
// If the ig is empty, delete him. This optimize rendering because no unuseful ig are
|
// If the ig is empty, delete him. This optimize rendering because no useless ig are
|
||||||
// tested for rendering. This speed up some 1/10 of ms...
|
// tested for rendering. This speed up some 1/10 of ms...
|
||||||
if(vegetIg->isEmpty())
|
if(vegetIg->isEmpty())
|
||||||
{
|
{
|
||||||
|
|
|
@ -1692,7 +1692,7 @@ void CMeshGeom::bkupOriginalSkinVertices()
|
||||||
// Copy VBuffer content into Original vertices normals.
|
// Copy VBuffer content into Original vertices normals.
|
||||||
if(_VBuffer.getVertexFormat() & CVertexBuffer::PositionFlag)
|
if(_VBuffer.getVertexFormat() & CVertexBuffer::PositionFlag)
|
||||||
{
|
{
|
||||||
// copy vertices from VBuffer. (NB: unuseful geomorphed vertices are still copied, but doesn't matter).
|
// copy vertices from VBuffer. (NB: useless geomorphed vertices are still copied, but doesn't matter).
|
||||||
_OriginalSkinVertices.resize(numVertices);
|
_OriginalSkinVertices.resize(numVertices);
|
||||||
for(uint i=0; i<numVertices;i++)
|
for(uint i=0; i<numVertices;i++)
|
||||||
{
|
{
|
||||||
|
@ -1701,7 +1701,7 @@ void CMeshGeom::bkupOriginalSkinVertices()
|
||||||
}
|
}
|
||||||
if(_VBuffer.getVertexFormat() & CVertexBuffer::NormalFlag)
|
if(_VBuffer.getVertexFormat() & CVertexBuffer::NormalFlag)
|
||||||
{
|
{
|
||||||
// copy normals from VBuffer. (NB: unuseful geomorphed normals are still copied, but doesn't matter).
|
// copy normals from VBuffer. (NB: useless geomorphed normals are still copied, but doesn't matter).
|
||||||
_OriginalSkinNormals.resize(numVertices);
|
_OriginalSkinNormals.resize(numVertices);
|
||||||
for(uint i=0; i<numVertices;i++)
|
for(uint i=0; i<numVertices;i++)
|
||||||
{
|
{
|
||||||
|
@ -1738,7 +1738,7 @@ void CMeshGeom::restoreOriginalSkinVertices()
|
||||||
// Copy VBuffer content into Original vertices normals.
|
// Copy VBuffer content into Original vertices normals.
|
||||||
if(_VBuffer.getVertexFormat() & CVertexBuffer::PositionFlag)
|
if(_VBuffer.getVertexFormat() & CVertexBuffer::PositionFlag)
|
||||||
{
|
{
|
||||||
// copy vertices from VBuffer. (NB: unuseful geomorphed vertices are still copied, but doesn't matter).
|
// copy vertices from VBuffer. (NB: useless geomorphed vertices are still copied, but doesn't matter).
|
||||||
for(uint i=0; i<numVertices;i++)
|
for(uint i=0; i<numVertices;i++)
|
||||||
{
|
{
|
||||||
*vba.getVertexCoordPointer(i)= _OriginalSkinVertices[i];
|
*vba.getVertexCoordPointer(i)= _OriginalSkinVertices[i];
|
||||||
|
@ -1746,7 +1746,7 @@ void CMeshGeom::restoreOriginalSkinVertices()
|
||||||
}
|
}
|
||||||
if(_VBuffer.getVertexFormat() & CVertexBuffer::NormalFlag)
|
if(_VBuffer.getVertexFormat() & CVertexBuffer::NormalFlag)
|
||||||
{
|
{
|
||||||
// copy normals from VBuffer. (NB: unuseful geomorphed normals are still copied, but doesn't matter).
|
// copy normals from VBuffer. (NB: useless geomorphed normals are still copied, but doesn't matter).
|
||||||
for(uint i=0; i<numVertices;i++)
|
for(uint i=0; i<numVertices;i++)
|
||||||
{
|
{
|
||||||
*vba.getNormalCoordPointer(i)= _OriginalSkinNormals[i];
|
*vba.getNormalCoordPointer(i)= _OriginalSkinNormals[i];
|
||||||
|
|
|
@ -2040,7 +2040,7 @@ void CMeshMRMGeom::bkupOriginalSkinVerticesSubset(uint wedgeStart, uint wedgeEnd
|
||||||
// Copy VBuffer content into Original vertices normals.
|
// Copy VBuffer content into Original vertices normals.
|
||||||
if(_VBufferFinal.getVertexFormat() & CVertexBuffer::PositionFlag)
|
if(_VBufferFinal.getVertexFormat() & CVertexBuffer::PositionFlag)
|
||||||
{
|
{
|
||||||
// copy vertices from VBuffer. (NB: unuseful geomorphed vertices are still copied, but doesn't matter).
|
// copy vertices from VBuffer. (NB: useless geomorphed vertices are still copied, but doesn't matter).
|
||||||
_OriginalSkinVertices.resize(_VBufferFinal.getNumVertices());
|
_OriginalSkinVertices.resize(_VBufferFinal.getNumVertices());
|
||||||
for(uint i=wedgeStart; i<wedgeEnd;i++)
|
for(uint i=wedgeStart; i<wedgeEnd;i++)
|
||||||
{
|
{
|
||||||
|
@ -2049,7 +2049,7 @@ void CMeshMRMGeom::bkupOriginalSkinVerticesSubset(uint wedgeStart, uint wedgeEnd
|
||||||
}
|
}
|
||||||
if(_VBufferFinal.getVertexFormat() & CVertexBuffer::NormalFlag)
|
if(_VBufferFinal.getVertexFormat() & CVertexBuffer::NormalFlag)
|
||||||
{
|
{
|
||||||
// copy normals from VBuffer. (NB: unuseful geomorphed normals are still copied, but doesn't matter).
|
// copy normals from VBuffer. (NB: useless geomorphed normals are still copied, but doesn't matter).
|
||||||
_OriginalSkinNormals.resize(_VBufferFinal.getNumVertices());
|
_OriginalSkinNormals.resize(_VBufferFinal.getNumVertices());
|
||||||
for(uint i=wedgeStart; i<wedgeEnd;i++)
|
for(uint i=wedgeStart; i<wedgeEnd;i++)
|
||||||
{
|
{
|
||||||
|
@ -2083,7 +2083,7 @@ void CMeshMRMGeom::restoreOriginalSkinVertices()
|
||||||
// Copy VBuffer content into Original vertices normals.
|
// Copy VBuffer content into Original vertices normals.
|
||||||
if(_VBufferFinal.getVertexFormat() & CVertexBuffer::PositionFlag)
|
if(_VBufferFinal.getVertexFormat() & CVertexBuffer::PositionFlag)
|
||||||
{
|
{
|
||||||
// copy vertices from VBuffer. (NB: unuseful geomorphed vertices are still copied, but doesn't matter).
|
// copy vertices from VBuffer. (NB: useless geomorphed vertices are still copied, but doesn't matter).
|
||||||
for(uint i=0; i<_VBufferFinal.getNumVertices();i++)
|
for(uint i=0; i<_VBufferFinal.getNumVertices();i++)
|
||||||
{
|
{
|
||||||
*vba.getVertexCoordPointer(i)= _OriginalSkinVertices[i];
|
*vba.getVertexCoordPointer(i)= _OriginalSkinVertices[i];
|
||||||
|
@ -2091,7 +2091,7 @@ void CMeshMRMGeom::restoreOriginalSkinVertices()
|
||||||
}
|
}
|
||||||
if(_VBufferFinal.getVertexFormat() & CVertexBuffer::NormalFlag)
|
if(_VBufferFinal.getVertexFormat() & CVertexBuffer::NormalFlag)
|
||||||
{
|
{
|
||||||
// copy normals from VBuffer. (NB: unuseful geomorphed normals are still copied, but doesn't matter).
|
// copy normals from VBuffer. (NB: useless geomorphed normals are still copied, but doesn't matter).
|
||||||
for(uint i=0; i<_VBufferFinal.getNumVertices();i++)
|
for(uint i=0; i<_VBufferFinal.getNumVertices();i++)
|
||||||
{
|
{
|
||||||
*vba.getNormalCoordPointer(i)= _OriginalSkinNormals[i];
|
*vba.getNormalCoordPointer(i)= _OriginalSkinNormals[i];
|
||||||
|
|
|
@ -316,7 +316,7 @@ uint CMeshMRMGeom::NumCacheVertexNormal4= NL_BlockByteL1 / sizeof(CRawVertexNorm
|
||||||
|
|
||||||
/* Old School template: include the same file with define switching,
|
/* Old School template: include the same file with define switching,
|
||||||
Was used before to reuse same code for and without SSE.
|
Was used before to reuse same code for and without SSE.
|
||||||
Unuseful now because SSE removed, but keep it for possible future work on it.
|
useless now because SSE removed, but keep it for possible future work on it.
|
||||||
*/
|
*/
|
||||||
#define ADD_MESH_MRM_SKIN_TEMPLATE
|
#define ADD_MESH_MRM_SKIN_TEMPLATE
|
||||||
#include "mesh_mrm_skin_template.cpp"
|
#include "mesh_mrm_skin_template.cpp"
|
||||||
|
|
|
@ -2389,7 +2389,7 @@ uint CMeshMRMSkinnedGeom::NumCacheVertexNormal4= NL_BlockByteL1 / sizeof(CRawVer
|
||||||
|
|
||||||
/* Old School template: include the same file with define switching,
|
/* Old School template: include the same file with define switching,
|
||||||
Was used before to reuse same code for and without SSE.
|
Was used before to reuse same code for and without SSE.
|
||||||
Unuseful now because SSE removed, but keep it for possible future work on it.
|
Useless now because SSE removed, but keep it for possible future work on it.
|
||||||
*/
|
*/
|
||||||
#define ADD_MESH_MRM_SKINNED_TEMPLATE
|
#define ADD_MESH_MRM_SKINNED_TEMPLATE
|
||||||
#include "mesh_mrm_skinned_template.cpp"
|
#include "mesh_mrm_skinned_template.cpp"
|
||||||
|
|
|
@ -1184,7 +1184,7 @@ void CScene::deleteModel(CTransform *model)
|
||||||
// add ot list of object to delete
|
// add ot list of object to delete
|
||||||
_ToDelete.push_back (model);
|
_ToDelete.push_back (model);
|
||||||
// remove this object from the RenderTrav, hence it won't be displayed
|
// remove this object from the RenderTrav, hence it won't be displayed
|
||||||
// still animDetail/Light/LoadBalance it. This is unuseful, but very rare
|
// still animDetail/Light/LoadBalance it. This is useless, but very rare
|
||||||
// and I prefer doing like this than to add a NULL ptr Test in each Traversal (which I then must do in CRenderTrav)
|
// and I prefer doing like this than to add a NULL ptr Test in each Traversal (which I then must do in CRenderTrav)
|
||||||
RenderTrav.removeRenderModel(model);
|
RenderTrav.removeRenderModel(model);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1849,7 +1849,7 @@ void CSkeletonModel::getLightHotSpotInWorld(CVector &modelPos, float &modelRadi
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* Else return the skeleton pos. NB: this seems unuseful since bone 0 not computed means no Skins.
|
/* Else return the skeleton pos. NB: this seems useless since bone 0 not computed means no Skins.
|
||||||
But lighting computation is still done and may use a VisualCollisionEntity.
|
But lighting computation is still done and may use a VisualCollisionEntity.
|
||||||
This system cache some infos according to position. This is why we must return a position
|
This system cache some infos according to position. This is why we must return a position
|
||||||
near the skeleton (else cache crash each frame => slowdown...)
|
near the skeleton (else cache crash each frame => slowdown...)
|
||||||
|
|
|
@ -192,7 +192,7 @@ void CSheetId::loadSheetId ()
|
||||||
removednbfiles++;
|
removednbfiles++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
nlinfo ("SHEETID: Removed %d files on %d from CSheetId because these files doesn't exists", removednbfiles, nbfiles);
|
nlinfo ("SHEETID: Removed %d files on %d from CSheetId because these files don't exist", removednbfiles, nbfiles);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Convert the map to one big string and 1 static map (id to name)
|
// Convert the map to one big string and 1 static map (id to name)
|
||||||
|
|
|
@ -24,7 +24,7 @@ using namespace NL3D;
|
||||||
|
|
||||||
|
|
||||||
// ***************************************************************************
|
// ***************************************************************************
|
||||||
// Quality factor. Usefull to get maximum of interseting values in the range 0..255.
|
// Quality factor. Useful to get maximum of interseting values in the range 0..255.
|
||||||
#define NL_LTB_MAX_DISTANCE_QUALITY_FACTOR 0.05f
|
#define NL_LTB_MAX_DISTANCE_QUALITY_FACTOR 0.05f
|
||||||
// The bigger, the lower the influence of the normal is. must be >=0
|
// The bigger, the lower the influence of the normal is. must be >=0
|
||||||
#define NL_LTB_NORMAL_BIAS 1.f
|
#define NL_LTB_NORMAL_BIAS 1.f
|
||||||
|
|
|
@ -319,7 +319,7 @@ int main(int nNbArg, char **ppArgs)
|
||||||
UVMax[i].U = (float)x+AllMaps[i]->getWidth();
|
UVMax[i].U = (float)x+AllMaps[i]->getWidth();
|
||||||
UVMax[i].V = (float)y+AllMaps[i]->getHeight();
|
UVMax[i].V = (float)y+AllMaps[i]->getHeight();
|
||||||
|
|
||||||
/* // Do not remove this is usefull for debugging
|
/* // Do not remove this is useful for debugging
|
||||||
{
|
{
|
||||||
NLMISC::COFile outTga;
|
NLMISC::COFile outTga;
|
||||||
string fmtName = ppArgs[1];
|
string fmtName = ppArgs[1];
|
||||||
|
|
|
@ -1094,7 +1094,7 @@ void CTView::OnDropFiles(HDROP hDropInfo)
|
||||||
{
|
{
|
||||||
Browse *parent = (Browse*)this->GetParent();
|
Browse *parent = (Browse*)this->GetParent();
|
||||||
char FileName[256];
|
char FileName[256];
|
||||||
int count=DragQueryFile(hDropInfo,0xffffffff,FileName,256); //count = nombre de fichiers dans le drop
|
int count=DragQueryFile(hDropInfo,0xffffffff,FileName,256); //count = files number in drop queue
|
||||||
|
|
||||||
|
|
||||||
POINT pos;
|
POINT pos;
|
||||||
|
@ -1491,9 +1491,10 @@ LRESULT CTView::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
_chdir (LastPath.c_str());
|
_chdir (LastPath.c_str());
|
||||||
CFileDialog load(true, NULL, LastPath.c_str(), OFN_ENABLESIZING | OFN_ALLOWMULTISELECT,
|
CFileDialog load(true, NULL, LastPath.c_str(), OFN_ENABLESIZING | OFN_ALLOWMULTISELECT,
|
||||||
"Targa bitmap (*.tga)|*.tga|All files (*.*)|*.*||",NULL);
|
"Targa bitmap (*.tga)|*.tga|All files (*.*)|*.*||",NULL);
|
||||||
load.m_ofn.lpstrFile = new char[10000]; //le buffer contient la list de tous les noms de fichier
|
load.m_ofn.lpstrFile = new char[10000]; // buffer contains filenames list
|
||||||
load.m_ofn.lpstrFile[0] = 0;
|
load.m_ofn.lpstrFile[0] = 0;
|
||||||
//avec 10ko on devrait tranquille ... si l'ensemble des noms des fichiers depassent 10000 cara, l'insertion n'a pas lieu
|
// with 10 KB we should be large enough...
|
||||||
|
// if all files are exceeding 10000 characters, insert would be skipped
|
||||||
load.m_ofn.nMaxFile = 10000-1;
|
load.m_ofn.nMaxFile = 10000-1;
|
||||||
if (load.DoModal()==IDOK)
|
if (load.DoModal()==IDOK)
|
||||||
{
|
{
|
||||||
|
|
|
@ -96,7 +96,7 @@ unsigned long PIC_Load(char* FileName, unsigned char Quantize)
|
||||||
if ( !strcmp(ext,"JPG") )
|
if ( !strcmp(ext,"JPG") )
|
||||||
{
|
{
|
||||||
type=1;
|
type=1;
|
||||||
}
|
}
|
||||||
else if ( !strcmp(ext,"TGA") )
|
else if ( !strcmp(ext,"TGA") )
|
||||||
{
|
{
|
||||||
type=2;
|
type=2;
|
||||||
|
|
|
@ -241,9 +241,9 @@ static uint CheckZone(std::string middleZoneFile, float weldThreshold, float mid
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////
|
/////////////////////////////////////////////////
|
||||||
// check whether each patch is correctly bound //
|
// check whether each patch is correctly bound //
|
||||||
////////////////////////////////////////////////
|
/////////////////////////////////////////////////
|
||||||
|
|
||||||
for (l = 0; l < zoneInfos[0].Patchs.size(); ++l)
|
for (l = 0; l < zoneInfos[0].Patchs.size(); ++l)
|
||||||
{
|
{
|
||||||
|
|
|
@ -305,9 +305,9 @@ void CleanZone ( std::vector<CPatchInfo> &zoneInfos, uint zoneId, const CAABBoxE
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////
|
/////////////////////////////////////////////////
|
||||||
// check whether each patch is correctly bound //
|
// check whether each patch is correctly bound //
|
||||||
////////////////////////////////////////////////
|
/////////////////////////////////////////////////
|
||||||
uint pass = 0;
|
uint pass = 0;
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
|
|
|
@ -351,7 +351,8 @@ void CConditionsView::OnUpdate(CView* pSender, LPARAM lHint, CObject* pHint)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
} while (subPos == NULL);
|
}
|
||||||
|
while (subPos == NULL);
|
||||||
|
|
||||||
if (pNode == NULL)
|
if (pNode == NULL)
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -238,7 +238,7 @@ void makeId( list<string>& dirs )
|
||||||
if( hFind == INVALID_HANDLE_VALUE )
|
if( hFind == INVALID_HANDLE_VALUE )
|
||||||
{
|
{
|
||||||
nlwarning ("Invalid File Handle");
|
nlwarning ("Invalid File Handle");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
do
|
do
|
||||||
|
|
|
@ -956,7 +956,7 @@ void CCDBNodeBranch::removeBranchInfoIt(TObsList::iterator it)
|
||||||
|
|
||||||
|
|
||||||
//-----------------------------------------------
|
//-----------------------------------------------
|
||||||
// Usefull for find
|
// Useful for find
|
||||||
//-----------------------------------------------
|
//-----------------------------------------------
|
||||||
class CCDBNodeBranchComp : public std::binary_function<ICDBNode *, ICDBNode *, bool>
|
class CCDBNodeBranchComp : public std::binary_function<ICDBNode *, ICDBNode *, bool>
|
||||||
{
|
{
|
||||||
|
|
|
@ -2075,13 +2075,13 @@ double CCharacterCL::computeSpeed()
|
||||||
// Compute and return the speed factor to apply to the animation.
|
// Compute and return the speed factor to apply to the animation.
|
||||||
// \param speedToDest : evaluted speed to destination.
|
// \param speedToDest : evaluted speed to destination.
|
||||||
// \return double : the speed factor to use for the current animation.
|
// \return double : the speed factor to use for the current animation.
|
||||||
// \todo GUIGUI : revoir les histoire de scale, faire ca mieux.
|
// \todo GUIGUI : review this scale problem and optimize it.
|
||||||
//-----------------------------------------------
|
//-----------------------------------------------
|
||||||
double CCharacterCL::computeSpeedFactor(double speedToDest)
|
double CCharacterCL::computeSpeedFactor(double speedToDest)
|
||||||
{
|
{
|
||||||
double speedFactor = 1.0;
|
double speedFactor = 1.0;
|
||||||
|
|
||||||
// \todo GUIGUI : faire cette histoire de emote beaucoup mieux, C NULL.
|
// \todo GUIGUI : optimize emotes, currently it's badly designed.
|
||||||
const CAnimationState *animStatePtr;
|
const CAnimationState *animStatePtr;
|
||||||
// If the current animation is an emote, get the right animation state.
|
// If the current animation is an emote, get the right animation state.
|
||||||
if(animState(MOVE) == CAnimationStateSheet::Emote)
|
if(animState(MOVE) == CAnimationStateSheet::Emote)
|
||||||
|
|
|
@ -359,7 +359,7 @@ NLMISC_VARIABLE( float, ForageSourceUP3, "" );
|
||||||
*/
|
*/
|
||||||
void CForageSourceCL::updateVisualPropertyBars(const NLMISC::TGameCycle &/* gameCycle */, const sint64 &prop)
|
void CForageSourceCL::updateVisualPropertyBars(const NLMISC::TGameCycle &/* gameCycle */, const sint64 &prop)
|
||||||
{
|
{
|
||||||
// NB: forage don't use CBarManager for 2 reasons: unusefull (forage bars exist only through VP),
|
// NB: forage don't use CBarManager for 2 reasons: useless (forage bars exist only through VP),
|
||||||
// and complicated since updated at each frame on client (because of smooth transition code below)
|
// and complicated since updated at each frame on client (because of smooth transition code below)
|
||||||
|
|
||||||
bool setBarsNow = (_BarDestValues[0] == BarNotInit);
|
bool setBarsNow = (_BarDestValues[0] == BarNotInit);
|
||||||
|
|
|
@ -2056,7 +2056,7 @@ void getItemText (CDBCtrlSheet *item, ucstring &itemText, const CItemSheet*pIS)
|
||||||
// ***************************************************************************
|
// ***************************************************************************
|
||||||
static void setupEnchantedItem(CSheetHelpSetup &setup, ucstring &itemText)
|
static void setupEnchantedItem(CSheetHelpSetup &setup, ucstring &itemText)
|
||||||
{
|
{
|
||||||
// if don't find the tag in the text (eg: if not usefull), no-op
|
// if don't find the tag in the text (eg: if not useful), no-op
|
||||||
static const ucstring enchantTag("%enchantment");
|
static const ucstring enchantTag("%enchantment");
|
||||||
if( itemText.find(enchantTag) == ucstring::npos )
|
if( itemText.find(enchantTag) == ucstring::npos )
|
||||||
return;
|
return;
|
||||||
|
@ -2147,7 +2147,7 @@ static void setupRawMaterialStats(CSheetHelpSetup &setup)
|
||||||
}
|
}
|
||||||
|
|
||||||
// force reset, but try to keep the precedent selection
|
// force reset, but try to keep the precedent selection
|
||||||
// (usefull to test same item-part from different MPs)
|
// (useful to test same item-part from different MPs)
|
||||||
sint32 precSel= pCB->getSelection();
|
sint32 precSel= pCB->getSelection();
|
||||||
pCB->setSelection(1);
|
pCB->setSelection(1);
|
||||||
pCB->setSelection(0);
|
pCB->setSelection(0);
|
||||||
|
@ -3126,7 +3126,7 @@ void setupSabrinaPhraseHelp(CSheetHelpSetup &setup, const CSPhraseCom &phrase, u
|
||||||
// get the phraseText
|
// get the phraseText
|
||||||
ucstring phraseText;
|
ucstring phraseText;
|
||||||
// if required, add the .sphrase requirements.
|
// if required, add the .sphrase requirements.
|
||||||
// NB: don't add if from bot chat validation (unsusefull cause already filtered by server)
|
// NB: don't add if from bot chat validation (useless cause already filtered by server)
|
||||||
pPM->buildPhraseDesc(phraseText, phrase, phraseSheetId, !setup.FromBotChat);
|
pPM->buildPhraseDesc(phraseText, phrase, phraseSheetId, !setup.FromBotChat);
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -69,7 +69,7 @@ public:
|
||||||
bool isListeningPeopleList(CPeopleList *pl) const;
|
bool isListeningPeopleList(CPeopleList *pl) const;
|
||||||
//@}
|
//@}
|
||||||
|
|
||||||
// For ChatGroup, usefull to know for which chat it is destinated
|
// For ChatGroup, useful to know for which chat it is destinated
|
||||||
CChatGroup::TGroupType FilterType;
|
CChatGroup::TGroupType FilterType;
|
||||||
// If FilterType==CChatGroup::dyn_chat, gives the index of dynchat
|
// If FilterType==CChatGroup::dyn_chat, gives the index of dynchat
|
||||||
uint32 DynamicChatDbIndex;
|
uint32 DynamicChatDbIndex;
|
||||||
|
|
|
@ -51,7 +51,7 @@ public:
|
||||||
sint32 moveTrackY (sint32 dy);
|
sint32 moveTrackY (sint32 dy);
|
||||||
|
|
||||||
/** Move the Target Ofs with a Delta, and recompute TrackPos from this Ofs.
|
/** Move the Target Ofs with a Delta, and recompute TrackPos from this Ofs.
|
||||||
* Usefull for finer controled group scrolling when the list is very big (with mouseWheel or scroll buttons)
|
* Useful for finer controled group scrolling when the list is very big (with mouseWheel or scroll buttons)
|
||||||
*/
|
*/
|
||||||
void moveTargetX (sint32 dx);
|
void moveTargetX (sint32 dx);
|
||||||
void moveTargetY (sint32 dy);
|
void moveTargetY (sint32 dy);
|
||||||
|
|
|
@ -667,7 +667,7 @@ protected:
|
||||||
uint32 _PackedArmourColor;
|
uint32 _PackedArmourColor;
|
||||||
|
|
||||||
|
|
||||||
// For an Item only. Usefull for LeftHand Filtering: must have a pointer to the right hand
|
// For an Item only. Useful for LeftHand Filtering: must have a pointer to the right hand
|
||||||
CDBCtrlSheet *_OtherHandItemFilter;
|
CDBCtrlSheet *_OtherHandItemFilter;
|
||||||
|
|
||||||
// This String is optional and usage dependent for Item, Macro, or Sentence
|
// This String is optional and usage dependent for Item, Macro, or Sentence
|
||||||
|
|
|
@ -74,7 +74,7 @@ public:
|
||||||
virtual void sort() { }
|
virtual void sort() { }
|
||||||
void needToSort() { _NeedToSort = true; invalidateCoords(); }
|
void needToSort() { _NeedToSort = true; invalidateCoords(); }
|
||||||
|
|
||||||
/** (usefull for list only) Force the validity of an element, even if its sheetId==0
|
/** (useful for list only) Force the validity of an element, even if its sheetId==0
|
||||||
* (empty slot displayed instead)
|
* (empty slot displayed instead)
|
||||||
* NB: invalidateCoords() called if state is changed
|
* NB: invalidateCoords() called if state is changed
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -367,7 +367,8 @@ void dolibcurltest()
|
||||||
addImageDownload("http://www.ryzom.com/fr/");
|
addImageDownload("http://www.ryzom.com/fr/");
|
||||||
addImageDownload("http://www.ryzom.com/de/");
|
addImageDownload("http://www.ryzom.com/de/");
|
||||||
|
|
||||||
do {
|
do
|
||||||
|
{
|
||||||
checkImageDownload();
|
checkImageDownload();
|
||||||
nlwarning("continue to sleep");
|
nlwarning("continue to sleep");
|
||||||
nlSleep(300);
|
nlSleep(300);
|
||||||
|
|
|
@ -50,7 +50,7 @@ public:
|
||||||
|
|
||||||
// Position of the group in world space
|
// Position of the group in world space
|
||||||
NLMISC::CVector Position;
|
NLMISC::CVector Position;
|
||||||
// usefull only if getUserScale()==true
|
// useful only if getUserScale()==true
|
||||||
float Scale;
|
float Scale;
|
||||||
|
|
||||||
void setUserScale(bool us);
|
void setUserScale(bool us);
|
||||||
|
|
|
@ -863,7 +863,7 @@ void CGroupInSceneBubbleManager::dynChatOpen (uint32 nBotUID, uint32 nBotName, c
|
||||||
nlassert( (DynStrs.size() >= 1) && (DynStrs.size() <= 9));
|
nlassert( (DynStrs.size() >= 1) && (DynStrs.size() <= 9));
|
||||||
CInterfaceManager *pIM = CInterfaceManager::getInstance();
|
CInterfaceManager *pIM = CInterfaceManager::getInstance();
|
||||||
|
|
||||||
// If the character doesn't exists in view field -> do not display the bubble
|
// If the character doesn't exist in view field -> do not display the bubble
|
||||||
|
|
||||||
CEntityCL *pEntity = EntitiesMngr.getEntityByCompressedIndex(nBotUID);
|
CEntityCL *pEntity = EntitiesMngr.getEntityByCompressedIndex(nBotUID);
|
||||||
if (ClientCfg.Local) pEntity = EntitiesMngr.entity(1);
|
if (ClientCfg.Local) pEntity = EntitiesMngr.entity(1);
|
||||||
|
|
|
@ -999,7 +999,7 @@ void CGroupInSceneUserInfo::updateDynamicData ()
|
||||||
// or directly from the forage source
|
// or directly from the forage source
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// NB: forage don't use CBarManager for 2 reasons: unusefull (forage bars exist only through VP),
|
// NB: forage don't use CBarManager for 2 reasons: useless (forage bars exist only through VP),
|
||||||
// and complicated since updated at each frame on client (because of smooth transition code)
|
// and complicated since updated at each frame on client (because of smooth transition code)
|
||||||
CForageSourceCL *forageSource = static_cast<CForageSourceCL*>(_Entity);
|
CForageSourceCL *forageSource = static_cast<CForageSourceCL*>(_Entity);
|
||||||
barInfo.Score[SCORES::hit_points]= forageSource->getTimeBar(); // Map TimeBar to HP
|
barInfo.Score[SCORES::hit_points]= forageSource->getTimeBar(); // Map TimeBar to HP
|
||||||
|
|
|
@ -217,7 +217,8 @@ void CMacroCmdManager::initInGame()
|
||||||
for (nOpt = 0; nOpt < 3; nOpt++)
|
for (nOpt = 0; nOpt < 3; nOpt++)
|
||||||
{
|
{
|
||||||
i = 0;
|
i = 0;
|
||||||
do {
|
do
|
||||||
|
{
|
||||||
sTmp = pIO->getValStr(prefix[nOpt]+NLMISC::toString(i));
|
sTmp = pIO->getValStr(prefix[nOpt]+NLMISC::toString(i));
|
||||||
if (!sTmp.empty())
|
if (!sTmp.empty())
|
||||||
{
|
{
|
||||||
|
@ -225,7 +226,8 @@ void CMacroCmdManager::initInGame()
|
||||||
wheretostock[nOpt]->push_back(nTexId);
|
wheretostock[nOpt]->push_back(nTexId);
|
||||||
}
|
}
|
||||||
++i;
|
++i;
|
||||||
} while (!sTmp.empty());
|
}
|
||||||
|
while (!sTmp.empty());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3636,7 +3636,8 @@ void CInstallThread::run()
|
||||||
pPM->renameFile(patchName, sourceName);
|
pPM->renameFile(patchName, sourceName);
|
||||||
pPM->applyDate(sourceName, lastFileDate);
|
pPM->applyDate(sourceName, lastFileDate);
|
||||||
}
|
}
|
||||||
} catch ( const std::exception& e)
|
}
|
||||||
|
catch ( const std::exception& e)
|
||||||
{
|
{
|
||||||
nlwarning("%s", e.what());
|
nlwarning("%s", e.what());
|
||||||
pPM->setState(true, ucstring(e.what()) );
|
pPM->setState(true, ucstring(e.what()) );
|
||||||
|
@ -3668,27 +3669,31 @@ void CInstallThread::run()
|
||||||
NLMISC::CFile::deleteFile(vFiles[i]);
|
NLMISC::CFile::deleteFile(vFiles[i]);
|
||||||
}
|
}
|
||||||
// Delete all directory from tmp directory
|
// Delete all directory from tmp directory
|
||||||
do {
|
do
|
||||||
|
{
|
||||||
vFiles.clear();
|
vFiles.clear();
|
||||||
CPath::getPathContent(install, true, true, false, vFiles);
|
CPath::getPathContent(install, true, true, false, vFiles);
|
||||||
for (uint32 i = 0; i < vFiles.size(); ++i)
|
for (uint32 i = 0; i < vFiles.size(); ++i)
|
||||||
{
|
{
|
||||||
NLMISC::CFile::deleteDirectory(vFiles[i]);
|
NLMISC::CFile::deleteDirectory(vFiles[i]);
|
||||||
}
|
}
|
||||||
} while ( !vFiles.empty() );
|
}
|
||||||
|
while ( !vFiles.empty() );
|
||||||
// delete tmp directory
|
// delete tmp directory
|
||||||
NLMISC::CFile::deleteDirectory(install);
|
NLMISC::CFile::deleteDirectory(install);
|
||||||
// delete libtorrent_logs directory if exist (not activate)
|
// delete libtorrent_logs directory if exist (not activate)
|
||||||
if (NLMISC::CFile::fileExists("libtorrent_logs"))
|
if (NLMISC::CFile::fileExists("libtorrent_logs"))
|
||||||
{
|
{
|
||||||
do {
|
do
|
||||||
|
{
|
||||||
vFiles.clear();
|
vFiles.clear();
|
||||||
CPath::getPathContent("libtorrent_logs", true, true, false, vFiles);
|
CPath::getPathContent("libtorrent_logs", true, true, false, vFiles);
|
||||||
for (uint32 i = 0; i < vFiles.size(); ++i)
|
for (uint32 i = 0; i < vFiles.size(); ++i)
|
||||||
{
|
{
|
||||||
NLMISC::CFile::deleteDirectory(vFiles[i]);
|
NLMISC::CFile::deleteDirectory(vFiles[i]);
|
||||||
}
|
}
|
||||||
} while ( !vFiles.empty() );
|
}
|
||||||
|
while ( !vFiles.empty() );
|
||||||
NLMISC::CFile::deleteDirectory("libtorrent_logs");
|
NLMISC::CFile::deleteDirectory("libtorrent_logs");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -440,7 +440,7 @@ private:
|
||||||
std::string CurrentFile;
|
std::string CurrentFile;
|
||||||
|
|
||||||
|
|
||||||
// Usefull pathes and names
|
// Useful pathes and names
|
||||||
|
|
||||||
/// Now deprecated : the launcher is the client ryzom
|
/// Now deprecated : the launcher is the client ryzom
|
||||||
std::string RyzomFilename;
|
std::string RyzomFilename;
|
||||||
|
@ -450,7 +450,7 @@ private:
|
||||||
std::string ClientPatchPath;
|
std::string ClientPatchPath;
|
||||||
std::string ClientDataPath;
|
std::string ClientDataPath;
|
||||||
|
|
||||||
/// Output usefull information for debugging in the log file
|
/// Output useful information for debugging in the log file
|
||||||
bool VerboseLog;
|
bool VerboseLog;
|
||||||
|
|
||||||
bool MustLaunchBatFile; // And then relaunch ryzom
|
bool MustLaunchBatFile; // And then relaunch ryzom
|
||||||
|
|
|
@ -52,7 +52,7 @@ COutpost::COutpost(const COutpost &other)
|
||||||
// ***************************************************************************
|
// ***************************************************************************
|
||||||
bool COutpost::setupOutpost(const CContinentParameters::CZC &zone, sint32 outpostId, CVillage *village)
|
bool COutpost::setupOutpost(const CContinentParameters::CZC &zone, sint32 outpostId, CVillage *village)
|
||||||
{
|
{
|
||||||
// Yoyo. legacy code. should no more be needed now. Still let for check (usefull?)
|
// Yoyo. legacy code. should no more be needed now. Still let for check (useful?)
|
||||||
NLMISC::CVector2f zonePos;
|
NLMISC::CVector2f zonePos;
|
||||||
if (!getPosFromZoneName(zone.Name, zonePos))
|
if (!getPosFromZoneName(zone.Name, zonePos))
|
||||||
{
|
{
|
||||||
|
|
|
@ -571,7 +571,7 @@ public:
|
||||||
//! For some messages, data are cut in small message then send to DSS via SBS.
|
//! For some messages, data are cut in small message then send to DSS via SBS.
|
||||||
//! Fragmentation enable to implement a progression bar.
|
//! Fragmentation enable to implement a progression bar.
|
||||||
//! Communication via SBS disable bandwith limitation caused by FS
|
//! Communication via SBS disable bandwith limitation caused by FS
|
||||||
//! Using sendMsgToDss is usefull only for big message like uploading Scenario or uploading runtime scenario
|
//! Using sendMsgToDss is useful only for big message like uploading Scenario or uploading runtime scenario
|
||||||
//! {
|
//! {
|
||||||
/*! Cut a messag in small chunk then send it to DSS via SBS.
|
/*! Cut a messag in small chunk then send it to DSS via SBS.
|
||||||
\param msg The message that will be cut in small chunk an send via sbs.
|
\param msg The message that will be cut in small chunk an send via sbs.
|
||||||
|
@ -743,7 +743,7 @@ public:
|
||||||
Called withou param this function update the DM action bar.
|
Called withou param this function update the DM action bar.
|
||||||
Called with as parameter DESPAWN_NPC, ADD_HP, KILL_NPC, ADD_HP, GRP_KILL, GRP_HEAL, CONTROL, STOP_CONTROL, TALK_AS, STOP_TALK it launch DM function
|
Called with as parameter DESPAWN_NPC, ADD_HP, KILL_NPC, ADD_HP, GRP_KILL, GRP_HEAL, CONTROL, STOP_CONTROL, TALK_AS, STOP_TALK it launch DM function
|
||||||
\see CClientEditionModule for more info
|
\see CClientEditionModule for more info
|
||||||
\parm args a list of optional argument may be empty or one of "DESPAWN_NPC" "ADD_HP" "KILL_NPC" "ADD_HP" "GRP_KILL" "GRP_HEAL" "CONTROL" "STOP_CONTROL" "TALK_AS" "STOP_TALK". Multi param could be usefull for setting the aggro distance (NIY).
|
\parm args a list of optional argument may be empty or one of "DESPAWN_NPC" "ADD_HP" "KILL_NPC" "ADD_HP" "GRP_KILL" "GRP_HEAL" "CONTROL" "STOP_CONTROL" "TALK_AS" "STOP_TALK". Multi param could be useful for setting the aggro distance (NIY).
|
||||||
*/
|
*/
|
||||||
void dssTarget( std::vector<std::string>& args);
|
void dssTarget( std::vector<std::string>& args);
|
||||||
|
|
||||||
|
@ -896,7 +896,7 @@ public:
|
||||||
This system enables to register class definition by registerGenerator.
|
This system enables to register class definition by registerGenerator.
|
||||||
Then the call to newComponent generates a CObjectTable using the template that have been save by registerGenerator.
|
Then the call to newComponent generates a CObjectTable using the template that have been save by registerGenerator.
|
||||||
The method getPropertyValue on a CObjectTable first look in the table of the object. Then in the palette. Then in its default value of the property then an thoses of his parents.
|
The method getPropertyValue on a CObjectTable first look in the table of the object. Then in the palette. Then in its default value of the property then an thoses of his parents.
|
||||||
The function getPropertyList enables to know all properties of an object (usefull for debug)
|
The function getPropertyList enables to know all properties of an object (useful for debug)
|
||||||
|
|
||||||
You can add an palette Element to the editor by addPaletteElement. A palette element is like a template that you clone and put in the scene.
|
You can add an palette Element to the editor by addPaletteElement. A palette element is like a template that you clone and put in the scene.
|
||||||
Palette element are mainly defined in r2_palette.lua (binding is done via CComLuaModule
|
Palette element are mainly defined in r2_palette.lua (binding is done via CComLuaModule
|
||||||
|
|
|
@ -5257,7 +5257,7 @@ void CEditor::onEditionModeDisconnected()
|
||||||
delete _NewScenario;
|
delete _NewScenario;
|
||||||
_NewScenario = NULL;
|
_NewScenario = NULL;
|
||||||
CHECK_EDITOR
|
CHECK_EDITOR
|
||||||
// Usefull only for the pionner that does not do requestTranslateFeatures()
|
// Useful only for the pionner that does not do requestTranslateFeatures()
|
||||||
// Because avec using the button the currentScenario = 0
|
// Because avec using the button the currentScenario = 0
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
|
@ -308,7 +308,7 @@ void CToolChoosePos::updateBeforeRender()
|
||||||
}
|
}
|
||||||
// see if all pos are accessible and update the _Valid flag
|
// see if all pos are accessible and update the _Valid flag
|
||||||
// NB NICO : THE FOLLOWING CODE IS WORKING BUT
|
// NB NICO : THE FOLLOWING CODE IS WORKING BUT
|
||||||
// see with others if it's usefull to check this type of collisions
|
// see with others if it's useful to check this type of collisions
|
||||||
// finally -> since check is never done, limited/no interest ...
|
// finally -> since check is never done, limited/no interest ...
|
||||||
/*
|
/*
|
||||||
if (shown && entity->getPrimitive())
|
if (shown && entity->getPrimitive())
|
||||||
|
|
|
@ -192,7 +192,7 @@ public:
|
||||||
sint nbHairColor() {return _NbHairColor;}
|
sint nbHairColor() {return _NbHairColor;}
|
||||||
|
|
||||||
|
|
||||||
/// Get all sheets (usefull for other managers (skill, brick, ...))
|
/// Get all sheets (useful for other managers (skill, brick, ...))
|
||||||
// @{
|
// @{
|
||||||
const TEntitySheetMap & getSheets() { return _EntitySheetContainer; }
|
const TEntitySheetMap & getSheets() { return _EntitySheetContainer; }
|
||||||
// @}
|
// @}
|
||||||
|
|
|
@ -64,7 +64,7 @@ namespace BOTCHATTYPE
|
||||||
// Same than user and item can be retired
|
// Same than user and item can be retired
|
||||||
UserRetirable,
|
UserRetirable,
|
||||||
// this item was created and sold by the player who whatch the list. appears only in the "Resale list".
|
// this item was created and sold by the player who whatch the list. appears only in the "Resale list".
|
||||||
// but usefull to know that it belongs to the player and therefore PRICE_RETIRE and RESALE_TIME_LEFT are relevant
|
// but useful to know that it belongs to the player and therefore PRICE_RETIRE and RESALE_TIME_LEFT are relevant
|
||||||
ResaleAndUser,
|
ResaleAndUser,
|
||||||
// same then ResaleAndUser and item can be retired
|
// same then ResaleAndUser and item can be retired
|
||||||
ResaleAndUserRetirable,
|
ResaleAndUserRetirable,
|
||||||
|
|
|
@ -501,7 +501,7 @@ private:
|
||||||
// class CPersistentDataRecordRyzomStore
|
// class CPersistentDataRecordRyzomStore
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// This is just a specialisation of the class that register it into the "RyzomTokenFamily"
|
// This is just a specialisation of the class that register it into the "RyzomTokenFamily"
|
||||||
// Use it only to store (else unusefull copy of default string table at clear())
|
// Use it only to store (else useless copy of default string table at clear())
|
||||||
|
|
||||||
class CPersistentDataRecordRyzomStore : public CPersistentDataRecord
|
class CPersistentDataRecordRyzomStore : public CPersistentDataRecord
|
||||||
{
|
{
|
||||||
|
|
|
@ -39,13 +39,13 @@ private:
|
||||||
uint32 _Id;
|
uint32 _Id;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Usefull because if not defined the compiler do not chose between
|
// Useful because if not defined the compiler do not chose between
|
||||||
// lh.operator uint32() < rh or lh < CSessionId(rh)
|
// lh.operator uint32() < rh or lh < CSessionId(rh)
|
||||||
|
|
||||||
inline bool operator<(const CSessionId& lh, uint32 rh) { return lh.asInt() < rh; }
|
inline bool operator<(const CSessionId& lh, uint32 rh) { return lh.asInt() < rh; }
|
||||||
inline bool operator==(const CSessionId& lh, uint32 rh) { return lh.asInt() == rh; }
|
inline bool operator==(const CSessionId& lh, uint32 rh) { return lh.asInt() == rh; }
|
||||||
inline bool operator!=(const CSessionId& lh, uint32 rh) { return lh.asInt() != rh; }
|
inline bool operator!=(const CSessionId& lh, uint32 rh) { return lh.asInt() != rh; }
|
||||||
// usefull for lh != 0
|
// useful for lh != 0
|
||||||
inline bool operator!=(const CSessionId& lh, int rh) { return lh.asInt() != uint32(rh); }
|
inline bool operator!=(const CSessionId& lh, int rh) { return lh.asInt() != uint32(rh); }
|
||||||
|
|
||||||
typedef CSessionId TSessionId;
|
typedef CSessionId TSessionId;
|
||||||
|
|
|
@ -117,7 +117,7 @@ void CRingAccess::init()
|
||||||
_R2PlotItemSheetId.insert( CSheetId( NLMISC::toString("r2_plot_item_%d.sitem", i)));
|
_R2PlotItemSheetId.insert( CSheetId( NLMISC::toString("r2_plot_item_%d.sitem", i)));
|
||||||
}
|
}
|
||||||
|
|
||||||
_SheetIdToAccess.clear();//only usefull when manualy re init file
|
_SheetIdToAccess.clear();//only useful when manualy re init file
|
||||||
// File stream
|
// File stream
|
||||||
CIFile file;
|
CIFile file;
|
||||||
|
|
||||||
|
|
|
@ -290,7 +290,7 @@ namespace RM_FABER_STAT_TYPE
|
||||||
return CI18N::get("mpstat" + NLMISC::toString((uint)stats));
|
return CI18N::get("mpstat" + NLMISC::toString((uint)stats));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Array saying for which item part built, what stat is usefull
|
// Array saying for which item part built, what stat is useful
|
||||||
class CItemPartToStat
|
class CItemPartToStat
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -107,7 +107,7 @@ public:
|
||||||
* Return ~0 if the instance number is already in use.
|
* Return ~0 if the instance number is already in use.
|
||||||
*/
|
*/
|
||||||
uint32 createAIInstance(const std::string &continentName, uint32 instanceNumber);
|
uint32 createAIInstance(const std::string &continentName, uint32 instanceNumber);
|
||||||
/** destroy an AI Instance (usefull for ring creation / destruction of session)
|
/** destroy an AI Instance (useful for ring creation / destruction of session)
|
||||||
@param instanceNumber is the AiInstance Id
|
@param instanceNumber is the AiInstance Id
|
||||||
@param displayWarningIfInstanceNotExist If false nothing happends when the specified instance do not exist
|
@param displayWarningIfInstanceNotExist If false nothing happends when the specified instance do not exist
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -175,7 +175,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
TPlayerMap _spawnedPlayers; // hum .. still usefull ?
|
TPlayerMap _spawnedPlayers; // hum .. still useful ?
|
||||||
/// Team composition.
|
/// Team composition.
|
||||||
typedef CHashMap<int, std::set<TDataSetRow> > TTeamMap;
|
typedef CHashMap<int, std::set<TDataSetRow> > TTeamMap;
|
||||||
TTeamMap _teams;
|
TTeamMap _teams;
|
||||||
|
|
|
@ -775,11 +775,13 @@ CGroupNpc* CGroupDesc<FamilyT>::createNpcGroup(CMgrNpc* mgr, CAIVector const& po
|
||||||
RYAI_MAP_CRUNCH::CWorldMap const& worldMap = CWorldContainer::getWorldMap();
|
RYAI_MAP_CRUNCH::CWorldMap const& worldMap = CWorldContainer::getWorldMap();
|
||||||
RYAI_MAP_CRUNCH::CWorldPosition wp;
|
RYAI_MAP_CRUNCH::CWorldPosition wp;
|
||||||
uint32 maxTries = 100;
|
uint32 maxTries = 100;
|
||||||
do {
|
do
|
||||||
|
{
|
||||||
rpos = pos;
|
rpos = pos;
|
||||||
rpos += randomPos(dispersionRadius);
|
rpos += randomPos(dispersionRadius);
|
||||||
--maxTries;
|
--maxTries;
|
||||||
} while (!worldMap.setWorldPosition(AITYPES::vp_auto, wp, rpos) && maxTries>0);
|
}
|
||||||
|
while (!worldMap.setWorldPosition(AITYPES::vp_auto, wp, rpos) && maxTries>0);
|
||||||
if (maxTries<=0)
|
if (maxTries<=0)
|
||||||
rpos = pos;
|
rpos = pos;
|
||||||
}
|
}
|
||||||
|
@ -804,11 +806,13 @@ CGroupNpc* CGroupDesc<FamilyT>::createNpcGroup(CMgrNpc* mgr, CAIVector const& po
|
||||||
RYAI_MAP_CRUNCH::CWorldMap const& worldMap = CWorldContainer::getWorldMap();
|
RYAI_MAP_CRUNCH::CWorldMap const& worldMap = CWorldContainer::getWorldMap();
|
||||||
RYAI_MAP_CRUNCH::CWorldPosition wp;
|
RYAI_MAP_CRUNCH::CWorldPosition wp;
|
||||||
uint32 maxTries = 100;
|
uint32 maxTries = 100;
|
||||||
do {
|
do
|
||||||
|
{
|
||||||
rpos = pos;
|
rpos = pos;
|
||||||
rpos += randomPos(dispersionRadius);
|
rpos += randomPos(dispersionRadius);
|
||||||
--maxTries;
|
--maxTries;
|
||||||
} while (!worldMap.setWorldPosition(AITYPES::vp_auto, wp, rpos) && maxTries>0);
|
}
|
||||||
|
while (!worldMap.setWorldPosition(AITYPES::vp_auto, wp, rpos) && maxTries>0);
|
||||||
if (maxTries<=0)
|
if (maxTries<=0)
|
||||||
rpos = pos;
|
rpos = pos;
|
||||||
}
|
}
|
||||||
|
|
|
@ -3042,7 +3042,7 @@ void setManagerAggroListTarget_ss_(CStateInstance* entity, CScriptStack& stack)
|
||||||
|
|
||||||
@subsection getBotIndexByName_s_f
|
@subsection getBotIndexByName_s_f
|
||||||
|
|
||||||
Get the index of a bot of a group by its name (or return -1). Mainly usefull for scripted boss.
|
Get the index of a bot of a group by its name (or return -1). Mainly useful for scripted boss.
|
||||||
|
|
||||||
botIndex begins at zero for the first member of the group, -1 if the bot is not found.
|
botIndex begins at zero for the first member of the group, -1 if the bot is not found.
|
||||||
|
|
||||||
|
@ -3228,7 +3228,7 @@ void isPlayerAlived_s_f(CStateInstance* entity, CScriptStack& stack)
|
||||||
@subsection getServerTimeStr__s
|
@subsection getServerTimeStr__s
|
||||||
|
|
||||||
Gets the server time as string "eg 21:17:14 the x"
|
Gets the server time as string "eg 21:17:14 the x"
|
||||||
This function is usefull for stat purpose or debug (to know when a boss is down)
|
This function is useful for stat purpose or debug (to know when a boss is down)
|
||||||
|
|
||||||
Arguments: > s(serverTime)
|
Arguments: > s(serverTime)
|
||||||
|
|
||||||
|
@ -4284,7 +4284,7 @@ void getBotEid_f_s(CStateInstance* entity, CScriptStack& stack)
|
||||||
@subsection getBotIndex_s_f
|
@subsection getBotIndex_s_f
|
||||||
Get the bot Index by its entityId.
|
Get the bot Index by its entityId.
|
||||||
Entity Id of a bot can be given via getCurrentSpeackerEid().
|
Entity Id of a bot can be given via getCurrentSpeackerEid().
|
||||||
It can be usefull to Known the index of the bot in the group with the EntityId.
|
It can be useful to Known the index of the bot in the group with the EntityId.
|
||||||
|
|
||||||
Arguments: s(botEid) -> f(botIndex),
|
Arguments: s(botEid) -> f(botIndex),
|
||||||
|
|
||||||
|
|
|
@ -491,7 +491,7 @@ namespace AITYPES
|
||||||
// if (FamilyTag < other.FamilyTag)
|
// if (FamilyTag < other.FamilyTag)
|
||||||
// return true;
|
// return true;
|
||||||
// if ( FamilyTag==other.FamilyTag
|
// if ( FamilyTag==other.FamilyTag
|
||||||
// && FamilyTag==family_tribe ) // usefull ?
|
// && FamilyTag==family_tribe ) // useful ?
|
||||||
// return TribeName < other.TribeName;
|
// return TribeName < other.TribeName;
|
||||||
// return false;
|
// return false;
|
||||||
// }
|
// }
|
||||||
|
|
|
@ -260,7 +260,7 @@ public:
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add the properties to the mirror (except the entity state)
|
* Add the properties to the mirror (except the entity state)
|
||||||
* If keepSheetId is false, the sheet id in the object will not be used (usefull to take the value in the mirror instead)
|
* If keepSheetId is false, the sheet id in the object will not be used (useful to take the value in the mirror instead)
|
||||||
*/
|
*/
|
||||||
void addPropertiesToMirror( const TDataSetRow& entityIndex, bool keepSheetId=true );
|
void addPropertiesToMirror( const TDataSetRow& entityIndex, bool keepSheetId=true );
|
||||||
|
|
||||||
|
|
|
@ -2578,7 +2578,7 @@ public:
|
||||||
// End of methods from "character_inventory_manipulation.h"
|
// End of methods from "character_inventory_manipulation.h"
|
||||||
////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
/// Ring stuff <=> useful to update the player DB to indicateds the current speed of the incarnated creature
|
/// Ring stuff <=> useful to update the player DB to indicate the current speed of the incarnated creature
|
||||||
void setNpcControl(const NLMISC::CEntityId& eid);
|
void setNpcControl(const NLMISC::CEntityId& eid);
|
||||||
void setStopNpcControl();
|
void setStopNpcControl();
|
||||||
|
|
||||||
|
|
|
@ -221,7 +221,7 @@ bool CDBDeltaFile::preload()
|
||||||
// check file exists
|
// check file exists
|
||||||
if (!CFile::fileExists(filepath))
|
if (!CFile::fileExists(filepath))
|
||||||
{
|
{
|
||||||
nlwarning("CDBDeltaFile::read(): failed, file '%s' doesn't exists", filepath.c_str());
|
nlwarning("CDBDeltaFile::read(): failed, file '%s' doesn't exist", filepath.c_str());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,7 @@ namespace NLQT
|
||||||
if(parent.isValid())
|
if(parent.isValid())
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return qMin(QFileSystemModel::rowCount(parent),1);
|
return qMin(QFileSystemModel::rowCount(parent),1);
|
||||||
|
|
|
@ -77,7 +77,7 @@ namespace NLQT
|
||||||
editor->addItem(label);
|
editor->addItem(label);
|
||||||
}
|
}
|
||||||
return editor;
|
return editor;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
switch (type->getType())
|
switch (type->getType())
|
||||||
|
@ -144,7 +144,7 @@ namespace NLQT
|
||||||
QComboBox *cb = static_cast<QComboBox*>(editor);
|
QComboBox *cb = static_cast<QComboBox*>(editor);
|
||||||
cb->setCurrentIndex(cb->findText(value));
|
cb->setCurrentIndex(cb->findText(value));
|
||||||
//cb->setIconSize()
|
//cb->setIconSize()
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
switch (type->getType())
|
switch (type->getType())
|
||||||
|
@ -193,14 +193,14 @@ namespace NLQT
|
||||||
if (value == oldValue)
|
if (value == oldValue)
|
||||||
{
|
{
|
||||||
// nothing's changed
|
// nothing's changed
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
nldebug(QString("setModelData from %1 to %2")
|
nldebug(QString("setModelData from %1 to %2")
|
||||||
.arg(oldValue).arg(value).toStdString().c_str());
|
.arg(oldValue).arg(value).toStdString().c_str());
|
||||||
model->setData(index, value, Qt::EditRole);
|
model->setData(index, value, Qt::EditRole);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
switch (type->getType())
|
switch (type->getType())
|
||||||
|
@ -214,7 +214,7 @@ namespace NLQT
|
||||||
if (QString("%1").arg(value) == oldValue)
|
if (QString("%1").arg(value) == oldValue)
|
||||||
{
|
{
|
||||||
// nothing's changed
|
// nothing's changed
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
nldebug(QString("setModelData from %1 to %2")
|
nldebug(QString("setModelData from %1 to %2")
|
||||||
|
@ -231,7 +231,7 @@ namespace NLQT
|
||||||
if (QString("%1").arg(value) == oldValue)
|
if (QString("%1").arg(value) == oldValue)
|
||||||
{
|
{
|
||||||
// nothing's changed
|
// nothing's changed
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
nldebug(QString("setModelData from %1 to %2")
|
nldebug(QString("setModelData from %1 to %2")
|
||||||
|
@ -252,7 +252,7 @@ namespace NLQT
|
||||||
if (value == oldValue)
|
if (value == oldValue)
|
||||||
{
|
{
|
||||||
// nothing's changed
|
// nothing's changed
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
nldebug(QString("setModelData from %1 to %2")
|
nldebug(QString("setModelData from %1 to %2")
|
||||||
|
|
|
@ -129,7 +129,7 @@ namespace NLQT
|
||||||
_ui.dirTree->setModel(_dirModel);
|
_ui.dirTree->setModel(_dirModel);
|
||||||
_dirModel->setRootPath(_ldPath);
|
_dirModel->setRootPath(_ldPath);
|
||||||
_ui.dirTree->setRootIndex(_dirModel->index(_ldPath));
|
_ui.dirTree->setRootIndex(_dirModel->index(_ldPath));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
_dirModel = new CFileSystemModel("");
|
_dirModel = new CFileSystemModel("");
|
||||||
|
|
|
@ -183,7 +183,7 @@ namespace NLQT
|
||||||
//flushValueChange ();
|
//flushValueChange ();
|
||||||
//UpdateAllViews (NULL);
|
//UpdateAllViews (NULL);
|
||||||
//return TRUE;
|
//return TRUE;
|
||||||
}
|
}
|
||||||
else if (loadedForm.contains(".dfn"))
|
else if (loadedForm.contains(".dfn"))
|
||||||
{
|
{
|
||||||
//nlassert (Dfn != NULL);
|
//nlassert (Dfn != NULL);
|
||||||
|
@ -198,7 +198,7 @@ namespace NLQT
|
||||||
//modify (NULL, NULL, false);
|
//modify (NULL, NULL, false);
|
||||||
//UpdateAllViews (NULL);
|
//UpdateAllViews (NULL);
|
||||||
//return TRUE;
|
//return TRUE;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
nlassert (_form != NULL);
|
nlassert (_form != NULL);
|
||||||
|
@ -239,7 +239,8 @@ namespace NLQT
|
||||||
|
|
||||||
void CGeorgesTreeViewDialog::doubleClicked ( const QModelIndex & index )
|
void CGeorgesTreeViewDialog::doubleClicked ( const QModelIndex & index )
|
||||||
{
|
{
|
||||||
if (index.column() == 1) {
|
if (index.column() == 1)
|
||||||
|
{
|
||||||
//QTreeView::doubleClicked(index);
|
//QTreeView::doubleClicked(index);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -298,7 +299,7 @@ namespace NLQT
|
||||||
// if (newState == Qt::Checked)
|
// if (newState == Qt::Checked)
|
||||||
// {
|
// {
|
||||||
// _ui.treeView->setRowHidden(in.row(),in.parent(),false);
|
// _ui.treeView->setRowHidden(in.row(),in.parent(),false);
|
||||||
// }
|
// }
|
||||||
// else
|
// else
|
||||||
// {
|
// {
|
||||||
// _ui.treeView->setRowHidden(in.row(),in.parent(),true);
|
// _ui.treeView->setRowHidden(in.row(),in.parent(),true);
|
||||||
|
@ -314,7 +315,7 @@ namespace NLQT
|
||||||
// if (newState == Qt::Checked)
|
// if (newState == Qt::Checked)
|
||||||
// {
|
// {
|
||||||
// _ui.treeView->setRowHidden(in2.row(),in,false);
|
// _ui.treeView->setRowHidden(in2.row(),in,false);
|
||||||
// }
|
// }
|
||||||
// else
|
// else
|
||||||
// {
|
// {
|
||||||
// _ui.treeView->setRowHidden(in2.row(),in,true);
|
// _ui.treeView->setRowHidden(in2.row(),in,true);
|
||||||
|
|
|
@ -133,7 +133,7 @@ namespace NLQT
|
||||||
if (value.contains(".shape"))
|
if (value.contains(".shape"))
|
||||||
{
|
{
|
||||||
return QIcon(":/images/pqrticles.png");
|
return QIcon(":/images/pqrticles.png");
|
||||||
}
|
}
|
||||||
else if(value.contains(".tga") || value.contains(".png"))
|
else if(value.contains(".tga") || value.contains(".png"))
|
||||||
{
|
{
|
||||||
qDebug() << p_index << p_role;
|
qDebug() << p_index << p_role;
|
||||||
|
@ -444,8 +444,8 @@ namespace NLQT
|
||||||
|
|
||||||
//columnData << QString(elmName.c_str()) << QString("default") << QString("default");
|
//columnData << QString(elmName.c_str()) << QString("default") << QString("default");
|
||||||
//parent->appendChild(new CFormItem(elmt, columnData, parent, UFormElm::ValueDefaultDfn, UFormElm::NodeDfn));
|
//parent->appendChild(new CFormItem(elmt, columnData, parent, UFormElm::ValueDefaultDfn, UFormElm::NodeDfn));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
nlinfo("getNodeByName returned false");
|
nlinfo("getNodeByName returned false");
|
||||||
|
|
|
@ -142,7 +142,7 @@ namespace NLQT
|
||||||
{
|
{
|
||||||
_emptyView->deleteLater();
|
_emptyView->deleteLater();
|
||||||
tabifyDockWidget(_emptyView, newView);
|
tabifyDockWidget(_emptyView, newView);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
tabifyDockWidget(_currentView,newView);
|
tabifyDockWidget(_currentView,newView);
|
||||||
|
@ -216,7 +216,7 @@ namespace NLQT
|
||||||
{
|
{
|
||||||
loadFile(*it, skelFileName);
|
loadFile(*it, skelFileName);
|
||||||
++it;
|
++it;
|
||||||
}
|
}
|
||||||
_AnimationSetDialog->updateListObject();
|
_AnimationSetDialog->updateListObject();
|
||||||
_AnimationSetDialog->updateListAnim();
|
_AnimationSetDialog->updateListAnim();
|
||||||
_SlotManagerDialog->updateUiSlots();
|
_SlotManagerDialog->updateUiSlots();
|
||||||
|
|
|
@ -138,10 +138,8 @@ namespace NLQT
|
||||||
done = false;
|
done = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
while (!done);
|
||||||
|
|
||||||
} while (!done);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void CObjectViewerDialog::updateRender()
|
void CObjectViewerDialog::updateRender()
|
||||||
|
|
|
@ -142,7 +142,7 @@ namespace NLQT
|
||||||
if (list.empty())
|
if (list.empty())
|
||||||
{
|
{
|
||||||
Modules::config().getConfigFile().getVar("SearchPaths").forceAsString("");
|
Modules::config().getConfigFile().getVar("SearchPaths").forceAsString("");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Modules::config().getConfigFile().getVar("SearchPaths").forceAsString("");
|
Modules::config().getConfigFile().getVar("SearchPaths").forceAsString("");
|
||||||
|
|
|
@ -615,8 +615,7 @@ int extractBotNames(int argc, char *argv[])
|
||||||
if (transName.find(ucstring("$")) != ucstring::npos)
|
if (transName.find(ucstring("$")) != ucstring::npos)
|
||||||
{
|
{
|
||||||
transName = fctsTitleId;
|
transName = fctsTitleId;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue