Changed: #825 Remove all warning when compiling Ryzom
This commit is contained in:
parent
c29989ee2e
commit
531ff7dfff
4 changed files with 13 additions and 13 deletions
|
@ -1729,7 +1729,7 @@ void CObjectViewer::serial (NLMISC::IStream& f)
|
|||
ParticleWorkspaceFilename = "";
|
||||
}
|
||||
// First instance
|
||||
uint firstInstance = _ListInstance.size();
|
||||
uint firstInstance = (uint)_ListInstance.size();
|
||||
|
||||
// Read information
|
||||
std::vector<CInstanceSave> readed;
|
||||
|
@ -2211,7 +2211,7 @@ uint CObjectViewer::addMesh (NL3D::IShape* pMeshShape, const char* meshName, uin
|
|||
}
|
||||
|
||||
// Return the instance index
|
||||
return _ListInstance.size()-1;
|
||||
return (uint)_ListInstance.size()-1;
|
||||
}
|
||||
else
|
||||
return 0xffffffff;
|
||||
|
@ -2291,13 +2291,13 @@ uint CObjectViewer::addCamera (const NL3D::CCameraInfo &cameraInfo, const char*
|
|||
iInfo->Saved.CameraInfo = cameraInfo;
|
||||
iInfo->Saved.Camera = true;
|
||||
_ListInstance.push_back (iInfo);
|
||||
_Cameras.push_back (_ListInstance.size()-1);
|
||||
_Cameras.push_back ((uint)_ListInstance.size()-1);
|
||||
|
||||
// Reinit camera
|
||||
initCamera ();
|
||||
|
||||
// Return the instance index
|
||||
return _ListInstance.size()-1;
|
||||
return (uint)_ListInstance.size()-1;
|
||||
}
|
||||
|
||||
// ***************************************************************************
|
||||
|
@ -2353,7 +2353,7 @@ uint CObjectViewer::addSkel (NL3D::IShape* pSkelShape, const char* skelName)
|
|||
_SkeletonScaleDlg->setSkeletonToEdit(skelModel, skelName);
|
||||
|
||||
// Return the instance
|
||||
return _ListInstance.size()-1;
|
||||
return (uint)_ListInstance.size()-1;
|
||||
}
|
||||
return 0xffffffff;
|
||||
}
|
||||
|
@ -2773,7 +2773,7 @@ void CObjectViewer::evalSoundTrack (float lastTime, float currentTime)
|
|||
uint CObjectViewer::addInstanceGroup(NL3D::CInstanceGroup *ig)
|
||||
{
|
||||
// First instance
|
||||
uint first = _ListInstance.size();
|
||||
uint first = (uint)_ListInstance.size();
|
||||
|
||||
// Add all models to the scene
|
||||
ig->addToScene(*CNELU::Scene, CNELU::Driver);
|
||||
|
@ -3184,7 +3184,7 @@ bool CObjectViewer::createVegetableLandscape()
|
|||
// progress
|
||||
dlgProgress.ProgressText.SetWindowText("Loading Zones...");
|
||||
dlgProgress.ProgressBar.SetPos(0);
|
||||
uint nbZones= _VegetableLandscapeZoneNames.size();
|
||||
uint nbZones= (uint)_VegetableLandscapeZoneNames.size();
|
||||
for(uint i=0; i<nbZones;i++)
|
||||
{
|
||||
// open the file
|
||||
|
@ -3417,7 +3417,7 @@ CInstanceInfo *CObjectViewer::getInstance (uint instance)
|
|||
// ***************************************************************************
|
||||
uint CObjectViewer::getNumInstance () const
|
||||
{
|
||||
return _ListInstance.size ();
|
||||
return (uint)_ListInstance.size ();
|
||||
}
|
||||
|
||||
// ***************************************************************************
|
||||
|
@ -3864,7 +3864,7 @@ uint CObjectViewer::getCameraInstance (uint cameraId) const
|
|||
|
||||
uint CObjectViewer::getNumCamera () const
|
||||
{
|
||||
return _Cameras.size ();
|
||||
return (uint)_Cameras.size ();
|
||||
}
|
||||
|
||||
int localizedMessageBox(HWND parentWindow, int messageStringID, int captionStringID, UINT nType)
|
||||
|
|
|
@ -448,7 +448,7 @@ void CParticleWorkspace::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
|
|||
f.serialVersion(0);
|
||||
f.xmlSerial(_Name, "NAME");
|
||||
f.xmlPush("PS_LIST");
|
||||
uint32 numNodes = _Nodes.size();
|
||||
uint32 numNodes = (uint32)_Nodes.size();
|
||||
// TODO : avoid to store the number of nodes
|
||||
f.xmlSerial(numNodes, "NUM_NODES");
|
||||
if (f.isReading())
|
||||
|
|
|
@ -168,7 +168,7 @@ public:
|
|||
std::string getPath() const;
|
||||
std::string getFilename() const { return _Filename; }
|
||||
// Get Number of nodes in the workspace
|
||||
uint getNumNode() const { return _Nodes.size(); }
|
||||
uint getNumNode() const { return (uint)_Nodes.size(); }
|
||||
/** Get a node in workspace
|
||||
* Can keep pointer safely as long as the node is not deleted
|
||||
*/
|
||||
|
|
|
@ -260,7 +260,7 @@ void CTextureAnimDlg::CGradientInterface::modifyGradient(TAction action, uint in
|
|||
break;
|
||||
}
|
||||
|
||||
P->getTextureGroup()->setTextures(&textureList[0], textureList.size());
|
||||
P->getTextureGroup()->setTextures(&textureList[0], (uint)textureList.size());
|
||||
}
|
||||
void CTextureAnimDlg::CGradientInterface::displayValue(CDC *dc, uint index, sint x, sint y)
|
||||
{
|
||||
|
@ -350,7 +350,7 @@ void CTextureAnimDlg::CGradientInterface::CTextureWrapper::set(NL3D::ITexture *t
|
|||
textureList[Index] = t;
|
||||
|
||||
|
||||
P->getTextureGroup()->setTextures(&textureList[0], textureList.size());
|
||||
P->getTextureGroup()->setTextures(&textureList[0], (uint)textureList.size());
|
||||
|
||||
Dlg->invalidateGrad();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue