aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-22 23:06:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Matt Raykowski 2010-05-13 21:46:45 -05:00
parent f8490fd4fe
commit 56fbeb4d1a
27 changed files with 85 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/tools/3d/build_clodtex/main.cpp
View file

@ -83,7 +83,7 @@ bool computeOneShape(const char *lodFile, const char *shapeIn, const char *shape
throw Exception("The shape %s is not a Mesh, a MeshMRM or MeshMMRMSkinned", shapeIn);
// store in mesh
nlassert (base)
nlassert (base);
base->setupLodCharacterTexture(lodTexture);
// serial

8
code/nel/tools/3d/build_interface/main.cpp
View file

@ -146,9 +146,9 @@ bool putIn (NLMISC::CBitmap *pSrc, NLMISC::CBitmap *pDst, sint32 x, sint32 y, bo
string getBaseName (const string &fullname)
{
string sTmp2 = "";
int pos = fullname.rfind('_');
for (int j = 0; j <= pos; ++j)
sTmp2 += fullname[j];
string::size_type pos = fullname.rfind('_');
if (pos != string::npos)
sTmp2 = fullname.substr(0, pos+1);
return sTmp2;
}
@ -214,7 +214,7 @@ int main(int nNbArg, char **ppArgs)
}
string fmtName;
uint iNumDirs = inputDirs.size();
uint iNumDirs = (uint)inputDirs.size();
if( iNumDirs )
{
fmtName = inputDirs.front();

6
code/nel/tools/3d/build_shadow_skin/main.cpp
View file

@ -110,7 +110,7 @@ void addShadowMesh(T *meshIn, float paramFaceRatio, sint paramMaxFace, const st
map<CShadowVertex, uint> shadowVertexMap;
uint numMerged= 0;
// Skip Geomorphs.
for(i=geomorphs.size();i<vertexUsed.size();i++)
for(i=(uint)geomorphs.size();i<vertexUsed.size();i++)
{
// If this vertex is used.
if(vertexUsed[i]!=-1)
@ -140,7 +140,7 @@ void addShadowMesh(T *meshIn, float paramFaceRatio, sint paramMaxFace, const st
if(it==shadowVertexMap.end())
{
// Append
uint index= shadowVertices.size();
uint index= (uint)shadowVertices.size();
vertexToVSkin[i]= index;
shadowVertices.push_back(shadowVert);
shadowVertexMap.insert(make_pair(shadowVert, index));
@ -210,7 +210,7 @@ void addShadowMesh(T *meshIn, float paramFaceRatio, sint paramMaxFace, const st
{
CIndexBuffer pb;
// fill
pb.setNumIndexes(shadowTriangles.size());
pb.setNumIndexes((uint32)shadowTriangles.size());
{
CIndexBufferReadWrite iba;
pb.lock (iba);

2
code/nel/tools/3d/cluster_viewer/view_cs.cpp
View file

@ -405,7 +405,7 @@ int main(int argc, char **argv)
{
nSelected--;
if(nSelected == -1)
nSelected = DispCS.size()-1;
nSelected = (sint32)DispCS.size()-1;
}
if (CNELU::AsyncListener.isKeyPushed (KeyS))
{

2
code/nel/tools/3d/file_info/main.cpp
View file

@ -137,7 +137,7 @@ uint MaxNumLightMap= 0;
void displayMeshBase(FILE *logStream, CMeshBase *meshBase)
{
uint nMat= meshBase->getNbMaterial();
uint nLms= meshBase->_LightInfos.size();
uint nLms= (uint)meshBase->_LightInfos.size();
MaxNumLightMap= max(MaxNumLightMap, nLms);
if(nLms)
{

2
code/nel/tools/3d/ig_lighter/ig_lighter.cpp
View file

@ -80,7 +80,7 @@ public:
pgId= min(pgId, (uint)(BAR_LENGTH-1));
sprintf (msg, "\r%s: %s", message, progressbar[pgId]);
uint i;
for (i=strlen(msg); i<79; i++)
for (i=(uint)strlen(msg); i<79; i++)
msg[i]=' ';
msg[i]=0;
printf (msg);

4
code/nel/tools/3d/ig_lighter_lib/ig_lighter_lib.cpp
View file

@ -256,7 +256,7 @@ void CIgLighterLib::lightIg(CInstanceLighter &instanceLighter,
// For any retreiverInstance with this identifier.
//----------------
uint numInstances= globalRetriever->getInstances().size();
uint numInstances= (uint)globalRetriever->getInstances().size();
for(uint instanceId=0; instanceId<numInstances; instanceId++)
{
const CRetrieverInstance &instance= globalRetriever->getInstance(instanceId);
@ -286,7 +286,7 @@ void CIgLighterLib::lightIg(CInstanceLighter &instanceLighter,
CIGSurfaceLightBuild::CRetrieverLightGrid &rlg= itRgm->second;
// Resize Grids.
uint numSurfaces= localRetriever.getSurfaces().size();
uint numSurfaces= (uint)localRetriever.getSurfaces().size();
rlg.Grids.resize( numSurfaces );
// Compute the bbox for all surfaces. (NB: local to the localRetriever).

21
code/nel/tools/3d/lightmap_optimizer/main.cpp
View file

@ -155,23 +155,24 @@ bool putIn (NLMISC::CBitmap *pSrc, NLMISC::CBitmap *pDst, sint32 x, sint32 y)
string getBaseName (const string &fullname)
{
string sTmp2 = "";
int pos = fullname.rfind('_');
for (int j = 0; j <= pos; ++j)
sTmp2 += fullname[j];
string::size_type pos = fullname.rfind('_');
if (pos != string::npos)
sTmp2 = fullname.substr(0, pos+1);
return sTmp2;
}
// ---------------------------------------------------------------------------
uint8 getLayerNb (const string &fullname)
{
string sTmp2;
uint8 nRet = 0;
int beg = fullname.rfind('_');
int end = fullname.rfind('.');
for (int j = beg+1; j < end; ++j)
sTmp2 += fullname[j];
string::size_type beg = fullname.rfind('_');
string::size_type end = fullname.rfind('.');
if (beg != string::npos)
{
string sTmp2 = fullname.substr(beg+1, end-beg-1);
NLMISC::fromString(sTmp2, nRet);
}
return nRet;
}
@ -478,7 +479,7 @@ int main(int nNbArg, char **ppArgs)
std::string start = AllLightmapNames[k].substr(0, tags[l].size());
if (NLMISC::nlstricmp(start, tags[l]) == 0)
{
bestLength = tags[l].size();
bestLength = (uint)tags[l].size();
// the tag matchs
AllLightmapTags[k] = l;
}

2
code/nel/tools/3d/panoply_maker/hls_bank_texture_info.cpp
View file

@ -96,7 +96,7 @@ void CHLSBankTextureInfo::CDXTCBitmap::build(const NLMISC::CBitmap &src)
void CHLSBankTextureInfo::CDXTCBitmap::buildBitmap(NLMISC::CBitmap &dst)
{
CMemStream memStream(true);
memStream.fill(&_Data[0], _Data.size());
memStream.fill(&_Data[0], (uint32)_Data.size());
// load the DXTC5 from memStream
dst.reset();
dst.load(memStream);

2
code/nel/tools/3d/panoply_maker/panoply_maker.cpp
View file

@ -760,7 +760,7 @@ static void BuildColoredVersionForOneBitmap(const CBuildInfo &bi, const std::str
std::string outputFileName = fileName;
// Add an instance entry to the hlsInfo
uint instId= hlsInfo.Instances.size();
uint instId= (uint)hlsInfo.Instances.size();
hlsInfo.Instances.resize(instId+1);
CHLSBankTextureInfo::CTextureInstance &hlsTextInstance= hlsInfo.Instances[instId];
hlsTextInstance.Mods.resize(masks.size());

6
code/nel/tools/3d/zone_check_bind/zone_utility.cpp
View file

@ -40,8 +40,8 @@ bool getZoneCoordByName(const char * name, uint16& x, uint16& y)
std::string zoneName(name);
// y
uint ind1 = zoneName.find("_");
if(ind1>=zoneName.length())
string::size_type ind1 = zoneName.find("_");
if(ind1 == string::npos || ind1>=zoneName.length())
{
nlwarning("bad file name");
return false;
@ -59,7 +59,7 @@ bool getZoneCoordByName(const char * name, uint16& x, uint16& y)
// x
x = 0;
uint ind2 = zoneName.length();
uint ind2 = (uint)zoneName.length();
if((ind2-ind1-1)!=2)
{
nlwarning("x code size is not a 2 characters code");

2
code/nel/tools/3d/zone_dependencies/zone_dependencies.cpp
View file

@ -79,7 +79,7 @@ void progress (const char *message, float progress)
pgId= min(pgId, (uint)(BAR_LENGTH-1));
sprintf (msg, "\r%s: %s", message, progressbar[pgId]);
uint i;
for (i=strlen(msg); i<79; i++)
for (i=(uint)strlen(msg); i<79; i++)
msg[i]=' ';
msg[i]=0;
printf (msg);

6
code/nel/tools/3d/zone_lib/zone_utility.cpp
View file

@ -101,8 +101,8 @@ bool getZoneCoordByName(const char * name, uint16& x, uint16& y)
std::string zoneName(name);
// y
uint ind1 = zoneName.find("_");
if(ind1>=zoneName.length())
string::size_type ind1 = zoneName.find("_");
if(ind1 == string::npos || ind1>=zoneName.length())
{
nlwarning("bad file name");
return false;
@ -120,7 +120,7 @@ bool getZoneCoordByName(const char * name, uint16& x, uint16& y)
// x
x = 0;
uint ind2 = zoneName.length();
uint ind2 = (uint)zoneName.length();
if((ind2-ind1-1)!=2)
{
nlwarning("x code size is not a 2 characters code");

4
code/nel/tools/3d/zviewer/zviewer.cpp
View file

@ -173,7 +173,7 @@ string getZoneNameByCoord(float x, float y)
string zoneName;
char ych[32];
sprintf(ych,"%d",(sint)ycount);
sint sz = strlen(ych);
sint sz = (sint)strlen(ych);
for(sint i = 0; i<sz; i++)
{
zoneName += ych[i];
@ -376,7 +376,7 @@ void displayZones()
if (ViewerCfg.AllPathRelative)
Landscape->Landscape.TileBank.makeAllPathRelative();
sint idx = ViewerCfg.Bank.find(".");
sint idx = (sint)ViewerCfg.Bank.find(".");
string farBank = ViewerCfg.Bank.substr(0,idx);
farBank += ".farbank";

4
code/nel/tools/misc/bnp_make/main.cpp
View file

@ -78,11 +78,11 @@ struct BNPHeader
FILE *f = fopen (filename.c_str(), "ab");
if (f == NULL) return false;
uint32 nNbFile = Files.size();
uint32 nNbFile = (uint32)Files.size();
fwrite (&nNbFile, sizeof(uint32), 1, f);
for (uint32 i = 0; i < nNbFile; ++i)
{
uint8 nStringSize = Files[i].Name.size();
uint8 nStringSize = (uint8)Files[i].Name.size();
fwrite (&nStringSize, 1, 1, f);
fwrite (Files[i].Name.c_str(), 1, nStringSize, f);
fwrite (&Files[i].Size, sizeof(uint32), 1, f);

22
code/nel/tools/misc/extract_filename/extract_filename.cpp
View file

@ -70,7 +70,7 @@ inline bool isASCII (uint8 c)
bool isASCII(vector<char> &fileArray)
{
// Array size
uint size = fileArray.size();
uint size = (uint)fileArray.size();
if (size)
{
@ -110,7 +110,7 @@ void removeBeginEndSpaces (string &str)
str = str.substr (index, str.length ()-index);
// Remove end space
index=str.length ()-1;
index=(sint)str.length ()-1;
while ( (index>0) && (str[index]==' ') )
index--;
str.resize (index+1);
@ -128,17 +128,17 @@ void removeChar (string &str, char ch)
void removeDirectory (string &str)
{
// Remove begin space
int pos = str.rfind ('\\');
int pos2 = str.rfind ('/');
string::size_type pos = str.rfind ('\\');
string::size_type pos2 = str.rfind ('/');
pos = std::max (pos, pos2);
if (pos>=0)
if (pos != string::npos)
str = str.substr (pos+1, str.size());
}
bool filterExtension (const char *str, const vector<string> &extensions)
{
// String size
uint size = strlen (str);
uint size = (uint)strlen (str);
// For each filter
for (uint i=0; i<extensions.size(); i++)
@ -164,14 +164,14 @@ const char *getExtension (const char *filename)
void removeExtension (string &filename)
{
int index = filename.rfind ('.');
string::size_type index = filename.rfind ('.');
filename.resize (index);
}
void extractStringsFromBinary (const vector<char> &fileArray, set<string> &filenameStrings, const vector<string> &extensions)
{
// Array size
uint size = fileArray.size();
uint size = (uint)fileArray.size();
// Array pointer
const char *arrayPointer = &fileArray[0];
@ -238,7 +238,7 @@ void extractStringsFromBinary (const vector<char> &fileArray, set<string> &filen
void extractStringsFromASCII (const vector<char> &fileArray, set<string> &filenameStrings, const vector<string> &extensions)
{
// Array size
uint size = fileArray.size();
uint size = (uint)fileArray.size();
if (size)
{
// Array pointer
@ -470,7 +470,7 @@ void progress (const char *message, float progress)
pgId= min(pgId, (uint)(BAR_LENGTH-1));
sprintf (msg, "\r%s %s", progressbar[pgId], message );
uint i;
for (i=strlen(msg); i<79; i++)
for (i=(uint)strlen(msg); i<79; i++)
msg[i]=' ';
msg[i]=0;
printf (msg);
@ -506,7 +506,7 @@ int main(int argc, char* argv[])
printf ("\rScaning files... \n");
uint size = 0;
uint maxSize = inputFiles.size();
uint maxSize = (uint)inputFiles.size();
set<string>::iterator ite = inputFiles.begin();
while (ite != inputFiles.end())
{

4
code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp
View file

@ -112,7 +112,7 @@ sint16 getFirstFreeFileTypeId()
{
for( sint16 id=0; id<256; ++id )
{
if( IdToFileType.find(id) == IdToFileType.end() )
if( IdToFileType.find((uint8)id) == IdToFileType.end() )
{
return id;
}
@ -609,7 +609,7 @@ int main( int argc, char ** argv )
{
//string outputLine = "type: " + toString((*it1).first.FormIDInfos.Type) +" id: " + toString((*it1).first.FormIDInfos.Id) + " file: " + (*it1).second +"\n";
string outputLine = " id: " + toString((*it1).first.Id) + " file: " + (*it1).second +"\n";
output.serialBuffer((uint8*)(const_cast<char*>(outputLine.data())),outputLine.size());
output.serialBuffer((uint8*)(const_cast<char*>(outputLine.data())),(uint)outputLine.size());
}
nlinfo ("------------- results ----------------");

2
code/nel/tools/misc/multi_cd_setup_fix/multi_cd_setup_fix.rc
View file

@ -7,7 +7,7 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
#include <windows.h>
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS

1
code/nel/tools/misc/multi_cd_setup_fix/resource.h
View file

@ -2,6 +2,7 @@
// Microsoft Developer Studio generated include file.
// Used by multi_cd_setup_fix.rc
//
#define IDC_STATIC -1
#define IDI_ICON1 101
#define IDI_ICON2 102
#define IDI_ICON3 103

2
code/nel/tools/misc/xml_packer/xml_packer.cpp
View file

@ -394,7 +394,7 @@ int main(int argc, char *argv[])
CPath::getPathContent(dirName, false, true, false, subDirs);
// filter the directories
for (uint i=subDirs.size(); i>0; --i)
for (uint i=(uint)subDirs.size(); i>0; --i)
{
if (!isExcludedDir(subDirs[i-1]))
dirStack.push_back(subDirs[i-1]);

4
code/nel/tools/pacs/build_indoor_rbank/mouline.cpp
View file

@ -182,7 +182,7 @@ void buildExteriorMesh(CCollisionMeshBuild &cmb, CExteriorMesh &em)
bool allowThis = true;
uint numLink = 0;
uint firstEdge = edges.size();
uint firstEdge = (uint)edges.size();
vector<CExteriorMesh::CEdge> loop;
@ -224,7 +224,7 @@ void buildExteriorMesh(CCollisionMeshBuild &cmb, CExteriorMesh &em)
// this way, collisions won't be checked in the pacs engine
if (loop.size() >= 3)
{
uint n = loop.size();
uint n = (uint)loop.size();
while (loop.front().Link >= 0 && loop.back().Link >= 0 && n > 0)
{
loop.push_back(loop.front());

26
code/nel/tools/pacs/build_rbank/build_rbank.cpp
View file

@ -629,7 +629,7 @@ void fixFaultyLinks(map<uint, CFaultyInstance> &faultyInstances,
CChainRef cr;
cr.Chain = chain;
cr.Previous = chain;
cr.From = fci.Vertices.size();
cr.From = (uint)fci.Vertices.size();
cr.BorderId = NLPACS::CChain::convertBorderChainId(retriever.getChain(chain).getRight());
while (!it.end())
@ -638,7 +638,7 @@ void fixFaultyLinks(map<uint, CFaultyInstance> &faultyInstances,
++it;
}
cr.To = fci.Vertices.size()-1;
cr.To = (uint)fci.Vertices.size()-1;
if (l < inst.Reconstructed[j].Chains.size()-1)
fci.Vertices.pop_back();
@ -654,7 +654,7 @@ void fixFaultyLinks(map<uint, CFaultyInstance> &faultyInstances,
CChainRef cr;
cr.Chain = chain;
cr.Previous = chain;
cr.From = fcn.Vertices.size();
cr.From = (uint)fcn.Vertices.size();
cr.BorderId = NLPACS::CChain::convertBorderChainId(nretriever.getChain(chain).getRight());
while (!it.end())
@ -663,7 +663,7 @@ void fixFaultyLinks(map<uint, CFaultyInstance> &faultyInstances,
++it;
}
cr.To = fcn.Vertices.size()-1;
cr.To = (uint)fcn.Vertices.size()-1;
if (l < neighb.Reconstructed[k].Chains.size()-1)
fcn.Vertices.pop_back();
@ -692,8 +692,8 @@ void fixFaultyLinks(map<uint, CFaultyInstance> &faultyInstances,
if (l<fci.Vertices.size())
break;
uint newChaini = retriever.getChains().size(),
newChainn = nretriever.getChains().size();
uint newChaini = (uint)retriever.getChains().size(),
newChainn = (uint)nretriever.getChains().size();
// save free border ids in order to renumerate them after splits
vector<uint> ifreeBorderIds, nfreeBorderIds;
@ -701,18 +701,18 @@ void fixFaultyLinks(map<uint, CFaultyInstance> &faultyInstances,
for (l=0; l<fci.Chains.size(); ++l)
ifreeBorderIds.push_back(fci.Chains[l].BorderId);
inextBorderId = retriever.getBorderChains().size();
inextBorderId = (uint)retriever.getBorderChains().size();
for (l=0; l<fcn.Chains.size(); ++l)
nfreeBorderIds.push_back(fcn.Chains[l].BorderId);
nnextBorderId = nretriever.getBorderChains().size();
nnextBorderId = (uint)nretriever.getBorderChains().size();
// generate splits from first chain on second chain
for (l=0; l<fci.Chains.size()-1; ++l)
{
uint splitAt = fci.Vertices.size()-1 - fci.Chains[l].To;
uint splitAt = (uint)fci.Vertices.size()-1 - fci.Chains[l].To;
for (m=fcn.Chains.size()-1; (sint)m>=0 && fcn.Chains[m].From>splitAt; --m)
for (m=(uint)fcn.Chains.size()-1; (sint)m>=0 && fcn.Chains[m].From>splitAt; --m)
;
// no split ?
@ -729,9 +729,9 @@ void fixFaultyLinks(map<uint, CFaultyInstance> &faultyInstances,
// generate splits from second chain on first chain
for (l=0; l<fcn.Chains.size()-1; ++l)
{
uint splitAt = fcn.Vertices.size()-1 - fcn.Chains[l].To;
uint splitAt = (uint)fcn.Vertices.size()-1 - fcn.Chains[l].To;
for (m=fci.Chains.size()-1; (sint)m>=0 && fci.Chains[m].From>splitAt; --m)
for (m=(uint)fci.Chains.size()-1; (sint)m>=0 && fci.Chains[m].From>splitAt; --m)
;
// no split ?
@ -862,7 +862,7 @@ void fixFaultyLinks(map<uint, CFaultyInstance> &faultyInstances,
// force links between instances (border chain links)
for (l=0; l<fci.Chains.size(); ++l)
{
m = fci.Chains.size()-1-l;
m = (uint)fci.Chains.size()-1-l;
(const_cast<NLPACS::CRetrieverInstance&>(instance)).forceBorderChainLink(fci.Chains[l].BorderId,
neighb.Instance,
fcn.Chains[m].BorderId,

14
code/nel/tools/pacs/build_rbank/build_surf.cpp
View file

@ -467,7 +467,7 @@ void NLPACS::CComputableSurfaceBorder::smooth(float val)
}
}
before = Vertices.size();
before = (uint)Vertices.size();
while (Vertices.size()>3) // don't smooth blow 3 vertices to avoid degenrated surfaces
{
minArea = val;
@ -496,7 +496,7 @@ void NLPACS::CComputableSurfaceBorder::smooth(float val)
break;
}
}
after = Vertices.size();
after = (uint)Vertices.size();
if (Verbose)
nlinfo("smoothed border %d-%d: %d -> %d", Left, Right, before, after);
@ -622,7 +622,7 @@ void NLPACS::CComputableSurface::buildBorders(CZoneTessellation *zoneTessel)
if ((Elements[elem]->EdgeLinks[edge] == NULL || Elements[elem]->EdgeLinks[edge]->SurfaceId != SurfaceId) &&
!Elements[elem]->EdgeFlag[edge])
{
BorderIds.push_back(BorderKeeper->size());
BorderIds.push_back((uint16)BorderKeeper->size());
BorderKeeper->resize(BorderKeeper->size()+1);
CComputableSurfaceBorder &border = BorderKeeper->back();
@ -1225,7 +1225,7 @@ void NLPACS::CZoneTessellation::build()
// if doesn't exist, create a new vertex
if ((vremapit = vremap.find(v[i])) == vremap.end())
{
element.Tri[i] = _Vertices.size();
element.Tri[i] = (uint32)_Vertices.size();
_Vertices.push_back(*(v[i]));
vremap.insert(make_pair(v[i], element.Tri[i]));
}
@ -1633,13 +1633,13 @@ void NLPACS::CZoneTessellation::generateBorders(float smooth)
}
float smScale = (Borders[border].Right < 0) ? 0.2f : 1.0f;
uint before = Borders[border].Vertices.size();
uint before = (uint)Borders[border].Vertices.size();
if (SmoothBorders && !Borders[border].DontSmooth)
{
Borders[border].smooth(smooth*smScale);
}
Borders[border].computeLength();
uint after = Borders[border].Vertices.size();
uint after = (uint)Borders[border].Vertices.size();
totalBefore += before;
totalAfter += after;
@ -1678,7 +1678,7 @@ void NLPACS::CZoneTessellation::saveTessellation(COFile &output)
for (i=0; i<_Tessellation.size(); ++i)
_Tessellation[i].ElemId = i;
uint32 numTessel = _Tessellation.size();
uint32 numTessel = (uint32)_Tessellation.size();
output.serial(numTessel);
for (i=0; i<_Tessellation.size(); ++i)

6
code/nel/tools/pacs/build_rbank/surface_splitter.cpp
View file

@ -49,8 +49,8 @@ void CSurfaceSplitter::build(CLocalRetriever &lr)
buildSurface(lr, i);
nlinfo("converted %d chains & %d surfaces", lr.getChains().size(), lr.getSurfaces().size());
_NumSurfaces = lr.getSurfaces().size();
_NumChains = lr.getChains().size();
_NumSurfaces = (uint)lr.getSurfaces().size();
_NumChains = (uint)lr.getChains().size();
//splitChains();
@ -502,7 +502,7 @@ void CSurfaceSplitter::replaceChain(CChainId chainId, const vector<CChainId> &ch
{
it = ploop.Chains.erase(it);
sint i;
for (i=chains.size()-1; i>=0; --i)
for (i=(sint)chains.size()-1; i>=0; --i)
{
it = ploop.Chains.insert(it, chains[i]);
}

4
code/nel/tools/pacs/build_rbank/surface_splitter.h
View file

@ -367,7 +367,7 @@ public:
Direction = forward ? +1 : -1;
if (splitter == NULL || pLoop == NULL)
return;
Chain = (Direction>0 ? 0 : pLoop->Chains.size()-1);
Chain = (Direction>0 ? 0 : (sint)pLoop->Chains.size()-1);
resetChain();
}
iterator(const iterator &it)
@ -420,7 +420,7 @@ public:
}
pChain = pSplitter->getChain(pLoop->Chains[Chain]);
ChainDirection = (pChain->Left == pLoop->Surface ? Direction : -Direction);
ChainVertex = (ChainDirection>0 ? 0 : pChain->Vertices.size()-1);
ChainVertex = (ChainDirection>0 ? 0 : (sint)pChain->Vertices.size()-1);
}
CVector2s64 operator * () const

8
code/nelns/admin_executor_service/log_report.cpp
View file

@ -37,7 +37,7 @@ enum TLogLineHeader { LHDate, LHTime, LHType, LHThread, LHService, LHCodeFile, L
///
bool isLogFile( const std::string& filename )
{
uint len = filename.size();
uint len = (uint)filename.size();
return (len >= 4 ) && (filename.substr( len-4 ) == ".log");
}
@ -180,7 +180,7 @@ const uint CurrentVersion = ~0;
// Return true and logVersion, or false if not a log with version
bool getLogVersion( const std::string& filename, uint& logVersion )
{
uint len = filename.size();
uint len = (uint)filename.size();
if ( (len > 4) && (filename.substr( len-4 ) == ".log") )
{
if ( filename.substr(0, 3) == "log" )
@ -242,7 +242,7 @@ void CMakeLogTask::run()
{
// Parse log target
uint targetVersion = CurrentVersion;
uint lts = _LogTarget.size();
uint lts = (uint)_LogTarget.size();
if ( _LogTarget.empty() || (_LogTarget == "v") )
{
targetMode = TTMMatchExactV;
@ -314,7 +314,7 @@ void CMakeLogTask::run()
CIFile logfile;
if ( logfile.open( *ilf, true ) )
{
_OutputLogReport->setProgress( ilf-filenames.begin(), filenames.size() );
_OutputLogReport->setProgress( (uint)(ilf-filenames.begin()), (uint)filenames.size() );
while ( ! logfile.eof() )
{
logfile.getline( line, MAX_LOG_LINE_SIZE );

2
code/nelns/admin_executor_service/log_report.h
View file

@ -149,7 +149,7 @@ public:
std::string service() { return _Service; }
virtual uint getNbDistinctLines() const { return _LogLineInfo.size(); }
virtual uint getNbDistinctLines() const { return (uint)_LogLineInfo.size(); }
virtual uint getNbTotalLines( NLMISC::CLog::TLogType logType );