server_common/recastnavigation_v1.6.0
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed local variable to avoid scope collisions

Browse Source 
I'm not sure if C++ vars are scoped into {} blocks, but in ported code that is an issue. It's easier to have vars names unique. Does not harm anyone I guess? ;-)
This commit is contained in:
Kromster80 2014-10-30 16:59:51 +03:00
parent 5df28b45bc
commit e3d5c9904e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Recast/Source/RecastLayers.cpp
View File

@ -239,15 +239,15 @@ bool rcBuildHeightfieldLayers(rcContext* ctx, rcCompactHeightfield& chf,
for (int i = (int)c.index, ni = (int)(c.index+c.count); i < ni; ++i)
{
const rcCompactSpan& s = chf.spans[i];
const unsigned char ri = srcReg[i];
if (ri == 0xff) continue;
const unsigned char regi = srcReg[i];
if (regi == 0xff) continue;
regs[ri].ymin = rcMin(regs[ri].ymin, s.y);
regs[ri].ymax = rcMax(regs[ri].ymax, s.y);
regs[regi].ymin = rcMin(regs[regi].ymin, s.y);
regs[regi].ymax = rcMax(regs[regi].ymax, s.y);
// Collect all region layers.
if (nlregs < RC_MAX_LAYERS)
lregs[nlregs++] = ri;
lregs[nlregs++] = regi;
// Update neighbours
for (int dir = 0; dir < 4; ++dir)
@ -258,8 +258,8 @@ bool rcBuildHeightfieldLayers(rcContext* ctx, rcCompactHeightfield& chf,
const int ay = y + rcGetDirOffsetY(dir);
const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, dir);
const unsigned char rai = srcReg[ai];
if (rai != 0xff && rai != ri)
addUnique(regs[ri].neis, regs[ri].nneis, rai);
if (rai != 0xff && rai != regi)
addUnique(regs[regi].neis, regs[regi].nneis, rai);
}
}