zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-13 07:57:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix some GCC warnings.

Browse source 
SVN r2213 (trunk)
This commit is contained in:
Randy Heit 2010-03-18 00:30:45 +00:00
parent 4d70292964
commit c8b8f40356
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/nodebuild.cpp
View file

@ -789,7 +789,7 @@ void FNodeBuilder::SplitSegs (DWORD set, node_t &node, DWORD splitseg, DWORD &ou
newvert.y += fixed_t(frac * double(Vertices[seg->v2].y - newvert.y)); newvert.y += fixed_t(frac * double(Vertices[seg->v2].y - newvert.y));
vertnum = VertexMap->SelectVertexClose (newvert); vertnum = VertexMap->SelectVertexClose (newvert);
if (vertnum == seg->v1 || vertnum == seg->v2) if (vertnum == (unsigned int)seg->v1 || vertnum == (unsigned int)seg->v2)
{ {
Printf("SelectVertexClose selected endpoint of seg %u\n", set); Printf("SelectVertexClose selected endpoint of seg %u\n", set);
} }

2
src/textures/ddstexture.cpp
View file

@ -769,7 +769,7 @@ void FDDSTexture::DecompressDXT5 (FWadLump &lump, bool premultiplied, BYTE *tcbu
BYTE *block; BYTE *block;
PalEntry color[4]; PalEntry color[4];
BYTE palcol[4]; BYTE palcol[4];
DWORD yalphaslice; DWORD yalphaslice = 0;
int ox, oy, x, y, i; int ox, oy, x, y, i;
for (oy = 0; oy < Height; oy += 4) for (oy = 0; oy < Height; oy += 4)

9
src/v_text.cpp
View file

@ -317,7 +317,8 @@ FBrokenLines *V_BreakLines (FFont *font, int maxwidth, const BYTE *string)
FBrokenLines lines[128]; // Support up to 128 lines (should be plenty) FBrokenLines lines[128]; // Support up to 128 lines (should be plenty)
const BYTE *space = NULL, *start = string; const BYTE *space = NULL, *start = string;
int i, c, w, nw; size_t i, ii;
int c, w, nw;
FString lastcolor, linecolor; FString lastcolor, linecolor;
bool lastWasSpace = false; bool lastWasSpace = false;
int kerning = font->GetDefaultKerning (); int kerning = font->GetDefaultKerning ();
@ -418,11 +419,11 @@ FBrokenLines *V_BreakLines (FFont *font, int maxwidth, const BYTE *string)
// Make a copy of the broken lines and return them // Make a copy of the broken lines and return them
FBrokenLines *broken = new FBrokenLines[i+1]; FBrokenLines *broken = new FBrokenLines[i+1];
for (c = 0; c < i; ++c) for (ii = 0; ii < i; ++ii)
{ {
broken[c] = lines[c]; broken[ii] = lines[ii];
} }
broken[c].Width = -1; broken[ii].Width = -1;
return broken; return broken;
} }