0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-27 14:21:46 +00:00

Fixed compilation warnings reported by GCC/Clang

gl/data/gl_setup.cpp:430:11: warning: comparison of integers of different signs: 'int' and 'unsigned int' [-Wsign-compare]
gl/data/gl_setup.cpp:527:19: warning: comparison of integers of different signs: 'int' and 'unsigned int' [-Wsign-compare]
gl/data/gl_setup.cpp:542:19: warning: comparison of integers of different signs: 'int' and 'unsigned int' [-Wsign-compare]
nodebuild.cpp:1056:63: warning: format specifies type 'ptrdiff_t' (aka 'long') but the argument has type 'int' [-Wformat]
p_glnodes.cpp:379:50: warning: comparison of integers of different signs: 'int' and 'unsigned int' [-Wsign-compare]
p_saveg.cpp:381:18: warning: comparison of integers of different signs: 'int' and 'unsigned int' [-Wsign-compare]
p_scroll.cpp:532:11: warning: comparison of integers of different signs: 'int' and 'unsigned int' [-Wsign-compare]
p_setup.cpp:2304:43: warning: format specifies type 'int' but the argument has type 'unsigned long' [-Wformat]
p_setup.cpp:2302:12: warning: comparison of integers of different signs: 'int' and 'unsigned long' [-Wsign-compare]
scripting/codegeneration/codegen.cpp:8488:20: warning: comparison of integers of different signs: 'int' and 'size_t' (aka 'unsigned long') [-Wsign-compare]
scripting/codegeneration/codegen.cpp:8606:15: warning: comparison of integers of different signs: 'int' and 'size_t' (aka 'unsigned long') [-Wsign-compare]
This commit is contained in:
alexey.lysiuk 2017-01-14 13:35:23 +02:00
parent f83444f3cc
commit 0b62645a35
7 changed files with 15 additions and 18 deletions

View file

@ -399,20 +399,15 @@ static void AddToVertex(const sector_t * sec, TArray<int> & list)
static void InitVertexData() static void InitVertexData()
{ {
TArray<int> * vt_sectorlists; auto vt_sectorlists = new TArray<int>[level.vertexes.Size()];
int i,j,k;
vt_sectorlists = new TArray<int>[level.vertexes.Size()];
for(auto &line : level.lines) for(auto &line : level.lines)
{ {
for(j=0;j<2;j++) for(int j = 0; j < 2; ++j)
{ {
vertex_t * v = j==0? line.v1 : line.v2; vertex_t * v = j==0? line.v1 : line.v2;
for(k=0;k<2;k++) for(int k = 0; k < 2; ++k)
{ {
sector_t * sec = k==0? line.frontsector : line.backsector; sector_t * sec = k==0? line.frontsector : line.backsector;
@ -427,7 +422,7 @@ static void InitVertexData()
} }
} }
for(i=0;i<level.vertexes.Size();i++) for(unsigned i = 0; i < level.vertexes.Size(); ++i)
{ {
auto vert = level.vertexes[i]; auto vert = level.vertexes[i];
int cnt = vt_sectorlists[i].Size(); int cnt = vt_sectorlists[i].Size();
@ -524,7 +519,7 @@ static void PrepareSegs()
level.sides[0].segs = new seg_t*[realsegs]; level.sides[0].segs = new seg_t*[realsegs];
level.sides[0].numsegs = 0; level.sides[0].numsegs = 0;
for(int i = 1; i < numsides; i++) for(unsigned i = 1; i < numsides; i++)
{ {
level.sides[i].segs = level.sides[i-1].segs + segcount[i-1]; level.sides[i].segs = level.sides[i-1].segs + segcount[i-1];
level.sides[i].numsegs = 0; level.sides[i].numsegs = 0;
@ -539,7 +534,7 @@ static void PrepareSegs()
} }
// sort the segs // sort the segs
for(int i = 0; i < numsides; i++) for(unsigned i = 0; i < numsides; i++)
{ {
if (level.sides[i].numsegs > 1) qsort(level.sides[i].segs, level.sides[i].numsegs, sizeof(seg_t*), segcmp); if (level.sides[i].numsegs > 1) qsort(level.sides[i].segs, level.sides[i].numsegs, sizeof(seg_t*), segcmp);
} }

View file

@ -1053,7 +1053,7 @@ void FNodeBuilder::PrintSet (int l, DWORD set)
Printf (PRINT_LOG, "set %d:\n", l); Printf (PRINT_LOG, "set %d:\n", l);
for (; set != DWORD_MAX; set = Segs[set].next) for (; set != DWORD_MAX; set = Segs[set].next)
{ {
Printf (PRINT_LOG, "\t%u(%td)%c%d(%d,%d)-%d(%d,%d)\n", set, Segs[set].frontsector->sectornum, Printf (PRINT_LOG, "\t%u(%d)%c%d(%d,%d)-%d(%d,%d)\n", set, Segs[set].frontsector->sectornum,
Segs[set].linedef == -1 ? '+' : ':', Segs[set].linedef == -1 ? '+' : ':',
Segs[set].v1, Segs[set].v1,
Vertices[Segs[set].v1].x>>16, Vertices[Segs[set].v1].y>>16, Vertices[Segs[set].v1].x>>16, Vertices[Segs[set].v1].y>>16,

View file

@ -376,7 +376,9 @@ static bool LoadGLSegs(FileReader * lump)
{ // check for gl-vertices { // check for gl-vertices
segs[i].v1 = &level.vertexes[checkGLVertex3(LittleLong(ml->v1))]; segs[i].v1 = &level.vertexes[checkGLVertex3(LittleLong(ml->v1))];
segs[i].v2 = &level.vertexes[checkGLVertex3(LittleLong(ml->v2))]; segs[i].v2 = &level.vertexes[checkGLVertex3(LittleLong(ml->v2))];
segs[i].PartnerSeg = LittleLong(ml->partner) == 0xffffffffu? nullptr : &segs[LittleLong(ml->partner)];
const DWORD partner = LittleLong(ml->partner);
segs[i].PartnerSeg = DWORD_MAX == partner ? nullptr : &segs[partner];
if(ml->linedef != 0xffff) // skip minisegs if(ml->linedef != 0xffff) // skip minisegs
{ {

View file

@ -378,7 +378,7 @@ FSerializer &Serialize(FSerializer &arc, const char *key, subsector_t *&ss, subs
.StringPtr(nullptr, str) .StringPtr(nullptr, str)
.EndArray(); .EndArray();
if (num_verts == level.vertexes.Size() && num_subs == numsubsectors && hasglnodes) if (num_verts == (int)level.vertexes.Size() && num_subs == numsubsectors && hasglnodes)
{ {
success = true; success = true;
int sub = 0; int sub = 0;
@ -1009,4 +1009,4 @@ void P_FreeMapDataBackup()
loadsectors.Clear(); loadsectors.Clear();
loadlines.Clear(); loadlines.Clear();
loadsides.Clear(); loadsides.Clear();
} }

View file

@ -529,7 +529,7 @@ void P_SpawnScrollers(void)
FLineIdIterator itr(l->args[0]); FLineIdIterator itr(l->args[0]);
while ((s = itr.Next()) >= 0) while ((s = itr.Next()) >= 0)
{ {
if (s != i) if (s != (int)i)
new DScroller(dx, dy, &level.lines[s], control, accel); new DScroller(dx, dy, &level.lines[s], control, accel);
} }
break; break;

View file

@ -2298,7 +2298,7 @@ static void P_AllocateSideDefs (MapData *map, int count)
sidetemp[i].a.alpha = SHRT_MIN; sidetemp[i].a.alpha = SHRT_MIN;
sidetemp[i].a.map = NO_SIDE; sidetemp[i].a.map = NO_SIDE;
} }
auto numsides = map->Size(ML_SIDEDEFS) / sizeof(mapsidedef_t); int numsides = map->Size(ML_SIDEDEFS) / sizeof(mapsidedef_t);
if (count < numsides) if (count < numsides)
{ {
Printf ("Map has %d unused sidedefs\n", numsides - count); Printf ("Map has %d unused sidedefs\n", numsides - count);

View file

@ -8485,7 +8485,7 @@ static int BuiltinFormat(VMValue *args, TArray<VMValue> &defaultparam, int numpa
// various type flags are not supported. not like stuff like 'hh' modifier is to be used in the VM. // various type flags are not supported. not like stuff like 'hh' modifier is to be used in the VM.
// the only combination that is parsed locally is %n$... // the only combination that is parsed locally is %n$...
bool haveargnums = false; bool haveargnums = false;
for (int i = 0; i < fmtstring.Len(); i++) for (size_t i = 0; i < fmtstring.Len(); i++)
{ {
char c = fmtstring[i]; char c = fmtstring[i];
if (in_fmt) if (in_fmt)