edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 06:28:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix clang-analyzer-security.FloatLoopCounter

Browse source 
[81/219] Building CXX object CMakeFiles/game-shared.dir/src/game/collision.cpp.o
/media/ddnet/src/game/collision.cpp:1197:2: warning: Variable 'f' with floating point type 'float' should not be used as a loop counter [clang-analyzer-security.FloatLoopCounter]
        for(float f = 0; f < d; f++)
        ^
This commit is contained in:
def 2020-10-12 15:11:51 +02:00
parent baa8b93d2f
commit 7d476c3858
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/game/collision.cpp
View file

@ -1027,9 +1027,9 @@ int CCollision::GetIndex(vec2 PrevPos, vec2 Pos)
int Nx = 0; int Nx = 0;
int Ny = 0; int Ny = 0;
for(float f = 0; f < Distance; f++) for(int i = 0, id = (int)Distance; i <= id; i++)
{ {
a = f / Distance; a = (float)i / Distance;
Tmp = mix(PrevPos, Pos, a); Tmp = mix(PrevPos, Pos, a);
Nx = clamp((int)Tmp.x / 32, 0, m_Width - 1); Nx = clamp((int)Tmp.x / 32, 0, m_Width - 1);
Ny = clamp((int)Tmp.y / 32, 0, m_Height - 1); Ny = clamp((int)Tmp.y / 32, 0, m_Height - 1);
@ -1193,9 +1193,9 @@ int CCollision::IntersectNoLaser(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2
float d = distance(Pos0, Pos1); float d = distance(Pos0, Pos1);
vec2 Last = Pos0; vec2 Last = Pos0;
for(float f = 0; f < d; f++) for(int i = 0, id = (int)d; i <= id; i++)
{ {
float a = f / d; float a = (int)i / d;
vec2 Pos = mix(Pos0, Pos1, a); vec2 Pos = mix(Pos0, Pos1, a);
int Nx = clamp(round_to_int(Pos.x) / 32, 0, m_Width - 1); int Nx = clamp(round_to_int(Pos.x) / 32, 0, m_Width - 1);
int Ny = clamp(round_to_int(Pos.y) / 32, 0, m_Height - 1); int Ny = clamp(round_to_int(Pos.y) / 32, 0, m_Height - 1);
@ -1224,9 +1224,9 @@ int CCollision::IntersectNoLaserNW(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, ve
float d = distance(Pos0, Pos1); float d = distance(Pos0, Pos1);
vec2 Last = Pos0; vec2 Last = Pos0;
for(float f = 0; f < d; f++) for(int i = 0, id = (int)d; i <= id; i++)
{ {
float a = f / d; float a = (float)i / d;
vec2 Pos = mix(Pos0, Pos1, a); vec2 Pos = mix(Pos0, Pos1, a);
if(IsNoLaser(round_to_int(Pos.x), round_to_int(Pos.y)) || IsFNoLaser(round_to_int(Pos.x), round_to_int(Pos.y))) if(IsNoLaser(round_to_int(Pos.x), round_to_int(Pos.y)) || IsFNoLaser(round_to_int(Pos.x), round_to_int(Pos.y)))
{ {
@ -1253,9 +1253,9 @@ int CCollision::IntersectAir(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2 *pO
float d = distance(Pos0, Pos1); float d = distance(Pos0, Pos1);
vec2 Last = Pos0; vec2 Last = Pos0;
for(float f = 0; f < d; f++) for(int i = 0, id = (int)d; i <= id; i++)
{ {
float a = f / d; float a = (float)i / d;
vec2 Pos = mix(Pos0, Pos1, a); vec2 Pos = mix(Pos0, Pos1, a);
if(IsSolid(round_to_int(Pos.x), round_to_int(Pos.y)) || (!GetTile(round_to_int(Pos.x), round_to_int(Pos.y)) && !GetFTile(round_to_int(Pos.x), round_to_int(Pos.y)))) if(IsSolid(round_to_int(Pos.x), round_to_int(Pos.y)) || (!GetTile(round_to_int(Pos.x), round_to_int(Pos.y)) && !GetFTile(round_to_int(Pos.x), round_to_int(Pos.y))))
{ {