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

Merge #5471

Browse source 
5471: map_replace_area: fixed implicit int to float conversions r=heinrich5991 a=sctt

fixes  #5469


Co-authored-by: f <scottistefano91@gmail.com>
This commit is contained in:
bors[bot] 2022-06-21 20:18:29 +00:00 committed by GitHub
parent b75289df35 222539e547
commit 110eed9bae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/tools/map_replace_area.cpp
View file

@ -1,11 +1,9 @@
#include <algorithm>
#include <base/logger.h>
#include <base/system.h>
#include <engine/shared/datafile.h>
#include <engine/storage.h>
#include <game/gamecore.h>
#include <game/mapitems.h>
#define INEXISTENT INT_MAX
// global new layers data (set by ReplaceAreaTiles and ReplaceAreaQuads)
void *g_pNewData[1024];
@ -430,10 +428,10 @@ bool InsertDestinationQuads(const float pGameAreas[2][2][2], const CQuad *pQuads
continue;
pDestQuads[QuadsCounter] = pQuads[i];
for(auto &m_aPoint : pDestQuads[QuadsCounter].m_aPoints)
for(auto &Point : pDestQuads[QuadsCounter].m_aPoints)
{
m_aPoint.x += f2fx(pQuadPos[0]) - pDestQuads[QuadsCounter].m_aPoints[4].x;
m_aPoint.y += f2fx(pQuadPos[1]) - pDestQuads[QuadsCounter].m_aPoints[4].y;
Point.x += f2fx(pQuadPos[0]) - pDestQuads[QuadsCounter].m_aPoints[4].x;
Point.y += f2fx(pQuadPos[1]) - pDestQuads[QuadsCounter].m_aPoints[4].y;
}
QuadsCounter++;
@ -651,18 +649,18 @@ bool GetLineIntersection(const float pLine[2], const float Point)
void SetInexistent(float *pArray, const int Count)
{
for(int i = 0; i < Count; i++)
pArray[i] = (float)INEXISTENT;
pArray[i] = std::numeric_limits<float>::max();
}
bool IsInexistent(const float *pArray, const int Count)
{
for(int i = 0; i < Count; i++)
if((float)pArray[i] == (float)INEXISTENT)
if(pArray[i] == std::numeric_limits<float>::max())
return true;
return false;
}
bool IsInexistent(const float Value)
{
return Value == INEXISTENT;
return Value == std::numeric_limits<float>::max();
}