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

Merge #4851

Browse source 
4851: Added direction enumeration for the editor r=def- a=Chairn

This is a similar work that was carried out by `@C0D3D3V` on introducing enumeration rather than magic numbers.

## Checklist

- [ ] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: Chairn <chairn.nq@hotmail.fr>
This commit is contained in:
bors[bot] 2022-03-21 09:01:18 +00:00 committed by GitHub
parent 564a59d603 bd5bfa453d
commit dfb0d7d269
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/game/editor/editor.h
View file

@ -496,6 +496,14 @@ enum
PROPTYPE_AUTOMAPPER, PROPTYPE_AUTOMAPPER,
}; };
enum
{
DIRECTION_LEFT = 1,
DIRECTION_RIGHT = 2,
DIRECTION_UP = 4,
DIRECTION_DOWN = 8,
};
typedef struct typedef struct
{ {
int x, y; int x, y;

130
src/game/editor/layer_tiles.cpp
View file

@ -631,46 +631,34 @@ void CLayerTiles::Shift(int Direction)
switch(Direction) switch(Direction)
{ {
case 1: case DIRECTION_LEFT:
{
// left
for(int y = 0; y < m_Height; ++y) for(int y = 0; y < m_Height; ++y)
{ {
mem_move(&m_pTiles[y * m_Width], &m_pTiles[y * m_Width + o], (m_Width - o) * sizeof(CTile)); mem_move(&m_pTiles[y * m_Width], &m_pTiles[y * m_Width + o], (m_Width - o) * sizeof(CTile));
mem_zero(&m_pTiles[y * m_Width + (m_Width - o)], o * sizeof(CTile)); mem_zero(&m_pTiles[y * m_Width + (m_Width - o)], o * sizeof(CTile));
} }
} break;
break; case DIRECTION_RIGHT:
case 2:
{
// right
for(int y = 0; y < m_Height; ++y) for(int y = 0; y < m_Height; ++y)
{ {
mem_move(&m_pTiles[y * m_Width + o], &m_pTiles[y * m_Width], (m_Width - o) * sizeof(CTile)); mem_move(&m_pTiles[y * m_Width + o], &m_pTiles[y * m_Width], (m_Width - o) * sizeof(CTile));
mem_zero(&m_pTiles[y * m_Width], o * sizeof(CTile)); mem_zero(&m_pTiles[y * m_Width], o * sizeof(CTile));
} }
} break;
break; case DIRECTION_UP:
case 4:
{
// up
for(int y = 0; y < m_Height - o; ++y) for(int y = 0; y < m_Height - o; ++y)
{ {
mem_copy(&m_pTiles[y * m_Width], &m_pTiles[(y + o) * m_Width], m_Width * sizeof(CTile)); mem_copy(&m_pTiles[y * m_Width], &m_pTiles[(y + o) * m_Width], m_Width * sizeof(CTile));
mem_zero(&m_pTiles[(y + o) * m_Width], m_Width * sizeof(CTile)); mem_zero(&m_pTiles[(y + o) * m_Width], m_Width * sizeof(CTile));
} }
} break;
break; case DIRECTION_DOWN:
case 8:
{
// down
for(int y = m_Height - 1; y >= o; --y) for(int y = m_Height - 1; y >= o; --y)
{ {
mem_copy(&m_pTiles[y * m_Width], &m_pTiles[(y - o) * m_Width], m_Width * sizeof(CTile)); mem_copy(&m_pTiles[y * m_Width], &m_pTiles[(y - o) * m_Width], m_Width * sizeof(CTile));
mem_zero(&m_pTiles[(y - o) * m_Width], m_Width * sizeof(CTile)); mem_zero(&m_pTiles[(y - o) * m_Width], m_Width * sizeof(CTile));
} }
} }
}
} }
void CLayerTiles::ShowInfo() void CLayerTiles::ShowInfo()
@ -1153,46 +1141,34 @@ void CLayerTele::Shift(int Direction)
switch(Direction) switch(Direction)
{ {
case 1: case DIRECTION_LEFT:
{
// left
for(int y = 0; y < m_Height; ++y) for(int y = 0; y < m_Height; ++y)
{ {
mem_move(&m_pTeleTile[y * m_Width], &m_pTeleTile[y * m_Width + o], (m_Width - o) * sizeof(CTeleTile)); mem_move(&m_pTeleTile[y * m_Width], &m_pTeleTile[y * m_Width + o], (m_Width - o) * sizeof(CTeleTile));
mem_zero(&m_pTeleTile[y * m_Width + (m_Width - o)], o * sizeof(CTeleTile)); mem_zero(&m_pTeleTile[y * m_Width + (m_Width - o)], o * sizeof(CTeleTile));
} }
} break;
break; case DIRECTION_RIGHT:
case 2:
{
// right
for(int y = 0; y < m_Height; ++y) for(int y = 0; y < m_Height; ++y)
{ {
mem_move(&m_pTeleTile[y * m_Width + o], &m_pTeleTile[y * m_Width], (m_Width - o) * sizeof(CTeleTile)); mem_move(&m_pTeleTile[y * m_Width + o], &m_pTeleTile[y * m_Width], (m_Width - o) * sizeof(CTeleTile));
mem_zero(&m_pTeleTile[y * m_Width], o * sizeof(CTeleTile)); mem_zero(&m_pTeleTile[y * m_Width], o * sizeof(CTeleTile));
} }
} break;
break; case DIRECTION_UP:
case 4:
{
// up
for(int y = 0; y < m_Height - o; ++y) for(int y = 0; y < m_Height - o; ++y)
{ {
mem_copy(&m_pTeleTile[y * m_Width], &m_pTeleTile[(y + o) * m_Width], m_Width * sizeof(CTeleTile)); mem_copy(&m_pTeleTile[y * m_Width], &m_pTeleTile[(y + o) * m_Width], m_Width * sizeof(CTeleTile));
mem_zero(&m_pTeleTile[(y + o) * m_Width], m_Width * sizeof(CTeleTile)); mem_zero(&m_pTeleTile[(y + o) * m_Width], m_Width * sizeof(CTeleTile));
} }
} break;
break; case DIRECTION_DOWN:
case 8:
{
// down
for(int y = m_Height - 1; y >= o; --y) for(int y = m_Height - 1; y >= o; --y)
{ {
mem_copy(&m_pTeleTile[y * m_Width], &m_pTeleTile[(y - o) * m_Width], m_Width * sizeof(CTeleTile)); mem_copy(&m_pTeleTile[y * m_Width], &m_pTeleTile[(y - o) * m_Width], m_Width * sizeof(CTeleTile));
mem_zero(&m_pTeleTile[(y - o) * m_Width], m_Width * sizeof(CTeleTile)); mem_zero(&m_pTeleTile[(y - o) * m_Width], m_Width * sizeof(CTeleTile));
} }
} }
}
} }
bool CLayerTele::IsEmpty(CLayerTiles *pLayer) bool CLayerTele::IsEmpty(CLayerTiles *pLayer)
@ -1441,46 +1417,34 @@ void CLayerSpeedup::Shift(int Direction)
switch(Direction) switch(Direction)
{ {
case 1: case DIRECTION_LEFT:
{
// left
for(int y = 0; y < m_Height; ++y) for(int y = 0; y < m_Height; ++y)
{ {
mem_move(&m_pSpeedupTile[y * m_Width], &m_pSpeedupTile[y * m_Width + o], (m_Width - o) * sizeof(CSpeedupTile)); mem_move(&m_pSpeedupTile[y * m_Width], &m_pSpeedupTile[y * m_Width + o], (m_Width - o) * sizeof(CSpeedupTile));
mem_zero(&m_pSpeedupTile[y * m_Width + (m_Width - o)], o * sizeof(CSpeedupTile)); mem_zero(&m_pSpeedupTile[y * m_Width + (m_Width - o)], o * sizeof(CSpeedupTile));
} }
} break;
break; case DIRECTION_RIGHT:
case 2:
{
// right
for(int y = 0; y < m_Height; ++y) for(int y = 0; y < m_Height; ++y)
{ {
mem_move(&m_pSpeedupTile[y * m_Width + o], &m_pSpeedupTile[y * m_Width], (m_Width - o) * sizeof(CSpeedupTile)); mem_move(&m_pSpeedupTile[y * m_Width + o], &m_pSpeedupTile[y * m_Width], (m_Width - o) * sizeof(CSpeedupTile));
mem_zero(&m_pSpeedupTile[y * m_Width], o * sizeof(CSpeedupTile)); mem_zero(&m_pSpeedupTile[y * m_Width], o * sizeof(CSpeedupTile));
} }
} break;
break; case DIRECTION_UP:
case 4:
{
// up
for(int y = 0; y < m_Height - o; ++y) for(int y = 0; y < m_Height - o; ++y)
{ {
mem_copy(&m_pSpeedupTile[y * m_Width], &m_pSpeedupTile[(y + o) * m_Width], m_Width * sizeof(CSpeedupTile)); mem_copy(&m_pSpeedupTile[y * m_Width], &m_pSpeedupTile[(y + o) * m_Width], m_Width * sizeof(CSpeedupTile));
mem_zero(&m_pSpeedupTile[(y + o) * m_Width], m_Width * sizeof(CSpeedupTile)); mem_zero(&m_pSpeedupTile[(y + o) * m_Width], m_Width * sizeof(CSpeedupTile));
} }
} break;
break; case DIRECTION_DOWN:
case 8:
{
// down
for(int y = m_Height - 1; y >= o; --y) for(int y = m_Height - 1; y >= o; --y)
{ {
mem_copy(&m_pSpeedupTile[y * m_Width], &m_pSpeedupTile[(y - o) * m_Width], m_Width * sizeof(CSpeedupTile)); mem_copy(&m_pSpeedupTile[y * m_Width], &m_pSpeedupTile[(y - o) * m_Width], m_Width * sizeof(CSpeedupTile));
mem_zero(&m_pSpeedupTile[(y - o) * m_Width], m_Width * sizeof(CSpeedupTile)); mem_zero(&m_pSpeedupTile[(y - o) * m_Width], m_Width * sizeof(CSpeedupTile));
} }
} }
}
} }
bool CLayerSpeedup::IsEmpty(CLayerTiles *pLayer) bool CLayerSpeedup::IsEmpty(CLayerTiles *pLayer)
@ -1785,46 +1749,34 @@ void CLayerSwitch::Shift(int Direction)
switch(Direction) switch(Direction)
{ {
case 1: case DIRECTION_LEFT:
{
// left
for(int y = 0; y < m_Height; ++y) for(int y = 0; y < m_Height; ++y)
{ {
mem_move(&m_pSwitchTile[y * m_Width], &m_pSwitchTile[y * m_Width + o], (m_Width - o) * sizeof(CSwitchTile)); mem_move(&m_pSwitchTile[y * m_Width], &m_pSwitchTile[y * m_Width + o], (m_Width - o) * sizeof(CSwitchTile));
mem_zero(&m_pSwitchTile[y * m_Width + (m_Width - o)], o * sizeof(CSwitchTile)); mem_zero(&m_pSwitchTile[y * m_Width + (m_Width - o)], o * sizeof(CSwitchTile));
} }
} break;
break; case DIRECTION_RIGHT:
case 2:
{
// right
for(int y = 0; y < m_Height; ++y) for(int y = 0; y < m_Height; ++y)
{ {
mem_move(&m_pSwitchTile[y * m_Width + o], &m_pSwitchTile[y * m_Width], (m_Width - o) * sizeof(CSwitchTile)); mem_move(&m_pSwitchTile[y * m_Width + o], &m_pSwitchTile[y * m_Width], (m_Width - o) * sizeof(CSwitchTile));
mem_zero(&m_pSwitchTile[y * m_Width], o * sizeof(CSwitchTile)); mem_zero(&m_pSwitchTile[y * m_Width], o * sizeof(CSwitchTile));
} }
} break;
break; case DIRECTION_UP:
case 4:
{
// up
for(int y = 0; y < m_Height - o; ++y) for(int y = 0; y < m_Height - o; ++y)
{ {
mem_copy(&m_pSwitchTile[y * m_Width], &m_pSwitchTile[(y + o) * m_Width], m_Width * sizeof(CSwitchTile)); mem_copy(&m_pSwitchTile[y * m_Width], &m_pSwitchTile[(y + o) * m_Width], m_Width * sizeof(CSwitchTile));
mem_zero(&m_pSwitchTile[(y + o) * m_Width], m_Width * sizeof(CSwitchTile)); mem_zero(&m_pSwitchTile[(y + o) * m_Width], m_Width * sizeof(CSwitchTile));
} }
} break;
break; case DIRECTION_DOWN:
case 8:
{
// down
for(int y = m_Height - 1; y >= o; --y) for(int y = m_Height - 1; y >= o; --y)
{ {
mem_copy(&m_pSwitchTile[y * m_Width], &m_pSwitchTile[(y - o) * m_Width], m_Width * sizeof(CSwitchTile)); mem_copy(&m_pSwitchTile[y * m_Width], &m_pSwitchTile[(y - o) * m_Width], m_Width * sizeof(CSwitchTile));
mem_zero(&m_pSwitchTile[(y - o) * m_Width], m_Width * sizeof(CSwitchTile)); mem_zero(&m_pSwitchTile[(y - o) * m_Width], m_Width * sizeof(CSwitchTile));
} }
} }
}
} }
bool CLayerSwitch::IsEmpty(CLayerTiles *pLayer) bool CLayerSwitch::IsEmpty(CLayerTiles *pLayer)
@ -2101,46 +2053,34 @@ void CLayerTune::Shift(int Direction)
switch(Direction) switch(Direction)
{ {
case 1: case DIRECTION_LEFT:
{
// left
for(int y = 0; y < m_Height; ++y) for(int y = 0; y < m_Height; ++y)
{ {
mem_move(&m_pTuneTile[y * m_Width], &m_pTuneTile[y * m_Width + o], (m_Width - o) * sizeof(CTuneTile)); mem_move(&m_pTuneTile[y * m_Width], &m_pTuneTile[y * m_Width + o], (m_Width - o) * sizeof(CTuneTile));
mem_zero(&m_pTuneTile[y * m_Width + (m_Width - o)], o * sizeof(CTuneTile)); mem_zero(&m_pTuneTile[y * m_Width + (m_Width - o)], o * sizeof(CTuneTile));
} }
} break;
break; case DIRECTION_RIGHT:
case 2:
{
// right
for(int y = 0; y < m_Height; ++y) for(int y = 0; y < m_Height; ++y)
{ {
mem_move(&m_pTuneTile[y * m_Width + o], &m_pTuneTile[y * m_Width], (m_Width - o) * sizeof(CTuneTile)); mem_move(&m_pTuneTile[y * m_Width + o], &m_pTuneTile[y * m_Width], (m_Width - o) * sizeof(CTuneTile));
mem_zero(&m_pTuneTile[y * m_Width], o * sizeof(CTuneTile)); mem_zero(&m_pTuneTile[y * m_Width], o * sizeof(CTuneTile));
} }
} break;
break; case DIRECTION_UP:
case 4:
{
// up
for(int y = 0; y < m_Height - o; ++y) for(int y = 0; y < m_Height - o; ++y)
{ {
mem_copy(&m_pTuneTile[y * m_Width], &m_pTuneTile[(y + o) * m_Width], m_Width * sizeof(CTuneTile)); mem_copy(&m_pTuneTile[y * m_Width], &m_pTuneTile[(y + o) * m_Width], m_Width * sizeof(CTuneTile));
mem_zero(&m_pTuneTile[(y + o) * m_Width], m_Width * sizeof(CTuneTile)); mem_zero(&m_pTuneTile[(y + o) * m_Width], m_Width * sizeof(CTuneTile));
} }
} break;
break; case DIRECTION_DOWN:
case 8:
{
// down
for(int y = m_Height - 1; y >= o; --y) for(int y = m_Height - 1; y >= o; --y)
{ {
mem_copy(&m_pTuneTile[y * m_Width], &m_pTuneTile[(y - o) * m_Width], m_Width * sizeof(CTuneTile)); mem_copy(&m_pTuneTile[y * m_Width], &m_pTuneTile[(y - o) * m_Width], m_Width * sizeof(CTuneTile));
mem_zero(&m_pTuneTile[(y - o) * m_Width], m_Width * sizeof(CTuneTile)); mem_zero(&m_pTuneTile[(y - o) * m_Width], m_Width * sizeof(CTuneTile));
} }
} }
}
} }
bool CLayerTune::IsEmpty(CLayerTiles *pLayer) bool CLayerTune::IsEmpty(CLayerTiles *pLayer)