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

Replace leftover memcpy with mem_copy

Browse source 
This change was made as I was doing some tests for the Haiku port.
This commit is contained in:
Panagiotis "Ivory" Vasilopoulos 2023-03-09 11:49:56 +01:00
parent 2222a1df57
commit 776eabcc78
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/tools/map_replace_area.cpp
View file

@ -499,7 +499,7 @@ void SetExtendedArea(MapObject &Ob)
{
float aInspectedArea[2];
if(GetLineIntersection(Ob.m_aaBaseArea[i], Ob.m_aaScreenOffset[i], aInspectedArea))
memcpy(Ob.m_aaExtendedArea[i], aInspectedArea, sizeof(float[2]));
mem_copy(Ob.m_aaExtendedArea[i], aInspectedArea, sizeof(float[2]));
continue;
}
@ -520,13 +520,13 @@ bool GetVisibleArea(const float aaGameArea[2][2], const MapObject &Ob, float aaV
SetInexistent((float *)aaVisibleArea, 4);
float aaInspectedArea[2][2];
memcpy(aaInspectedArea, aaGameArea, sizeof(float[2][2]));
mem_copy(aaInspectedArea, aaGameArea, sizeof(float[2][2]));
for(int i = 0; i < 2; i++)
{
if(Ob.m_aSpeed[i] == 1)
{
memcpy(aaInspectedArea[i], Ob.m_aaExtendedArea[i], sizeof(float[2]));
mem_copy(aaInspectedArea[i], Ob.m_aaExtendedArea[i], sizeof(float[2]));
continue;
}
@ -538,7 +538,7 @@ bool GetVisibleArea(const float aaGameArea[2][2], const MapObject &Ob, float aaV
}
if(aaVisibleArea)
memcpy(aaVisibleArea, aaInspectedArea, sizeof(float[2][2]));
mem_copy(aaVisibleArea, aaInspectedArea, sizeof(float[2][2]));
return true;
}
@ -594,8 +594,8 @@ void GetGameAreaDistance(const float aaaGameAreas[2][2][2], const MapObject aObs
void GetGameAreaDistance(const float aaaGameAreas[2][2][2], const MapObject aObs[2], const float aaVisibleArea[2][2], float aDistance[2])
{
float aaaVisibleAreas[2][2][2];
memcpy(aaaVisibleAreas[0], aaVisibleArea[0], sizeof(float[2][2]));
memcpy(aaaVisibleAreas[1], aaVisibleArea[0], sizeof(float[2][2]));
mem_copy(aaaVisibleAreas[0], aaVisibleArea[0], sizeof(float[2][2]));
mem_copy(aaaVisibleAreas[1], aaVisibleArea[0], sizeof(float[2][2]));
GetGameAreaDistance(aaaGameAreas, aObs, aaaVisibleAreas, aDistance);
}
@ -636,7 +636,7 @@ bool GetLineIntersection(const float aLine1[2], const float aLine2[2], float aIn
return false;
if(aIntersection)
memcpy(aIntersection, aBorders, sizeof(float[2]));
mem_copy(aIntersection, aBorders, sizeof(float[2]));
return true;
}